From 2a20810d1a2d9542e41dea1485ad40f8caa809e4 Mon Sep 17 00:00:00 2001 From: shi_jq Date: Wed, 12 Mar 2025 15:01:58 +0800 Subject: [PATCH] [ref]kbd->iot --- .../interlock_api/InterLockInterface.h | 4 +- .../alarm_server/test/pb_row_vs_col/main.cpp | 20 +- .../test/pb_row_vs_col/test_data.pb.cc | 76 +++--- .../test/pb_row_vs_col/test_data.pb.h | 218 +++++++++--------- .../test/pb_row_vs_col/test_data.proto | 2 +- .../service/interlock_api/InterLockImpl.cpp | 8 +- .../src/service/interlock_api/InterLockImpl.h | 12 +- .../operate_server/OperateServerClass.cpp | 2 +- .../src/sys/sys_dog_auth_api/DogAuthImpl.cpp | 4 +- .../src/sys/sys_dog_auth_api/DogAuthImpl.h | 8 +- .../src/sys/sys_proc_mng_api/ProcMngImpl.h | 4 +- 11 files changed, 179 insertions(+), 179 deletions(-) diff --git a/platform/src/include/service/interlock_api/InterLockInterface.h b/platform/src/include/service/interlock_api/InterLockInterface.h index 57153921..f7e576a3 100644 --- a/platform/src/include/service/interlock_api/InterLockInterface.h +++ b/platform/src/include/service/interlock_api/InterLockInterface.h @@ -27,12 +27,12 @@ namespace iot_service public: /** @brief 初始化 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ virtual int initialize() =0 ; /** @brief 判断联锁关系 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ virtual int CheckCtrlInterlock(const char *strCtrlPointName, const double dTargValue,std::string &strResult, bool &bSuccess) =0; }; diff --git a/platform/src/service/alarm_server/test/pb_row_vs_col/main.cpp b/platform/src/service/alarm_server/test/pb_row_vs_col/main.cpp index d92f4091..6dd48749 100644 --- a/platform/src/service/alarm_server/test/pb_row_vs_col/main.cpp +++ b/platform/src/service/alarm_server/test/pb_row_vs_col/main.cpp @@ -46,10 +46,10 @@ void testRowStyle() for (; nLoopCnt < g_nMaxLoop && !g_bNeedExit; ++nLoopCnt) { - kbd_test::RowStyle objRowStyle; + iot_test::RowStyle objRowStyle; for (int nRowCnt = 0; nRowCnt < g_nRowPerMsg; ++nRowCnt) { - kbd_test::OneRow *pOneRow = objRowStyle.add_row(); + iot_test::OneRow *pOneRow = objRowStyle.add_row(); pOneRow->set_int32_val(nRowCnt); pOneRow->set_int64_val(nRowCnt); @@ -71,7 +71,7 @@ void testRowStyle() strData.clear(); objRowStyle.SerializeToString(&strData); - kbd_test::RowStyle objRowStyle_2; + iot_test::RowStyle objRowStyle_2; objRowStyle_2.ParseFromString(strData); } @@ -104,7 +104,7 @@ void testColStyle() for (; nLoopCnt < g_nMaxLoop && !g_bNeedExit; ++nLoopCnt) { - kbd_test::ColStyle objColStyle; + iot_test::ColStyle objColStyle; for (int nRowCnt = 0; nRowCnt < g_nRowPerMsg; ++nRowCnt) { objColStyle.add_int32_val(nRowCnt); @@ -128,7 +128,7 @@ void testColStyle() strData.clear(); objColStyle.SerializeToString(&strData); - kbd_test::ColStyle objColStyle_2; + iot_test::ColStyle objColStyle_2; objColStyle_2.ParseFromString(strData); } @@ -150,8 +150,8 @@ void testColStyle() //< 测试一些写法的安全性 void otherTest() { - kbd_test::RowStyle objRowStyle_Src; - google::protobuf::RepeatedPtrField *pField_Src = objRowStyle_Src.mutable_row(); + iot_test::RowStyle objRowStyle_Src; + google::protobuf::RepeatedPtrField *pField_Src = objRowStyle_Src.mutable_row(); std::cout << "\n*****************************" << std::endl; std::cout << "pField_Src->Capacity() == " << pField_Src->Capacity() << std::endl; @@ -159,7 +159,7 @@ void otherTest() for (int nRowCnt = 0; nRowCnt < g_nRowPerMsg; ++nRowCnt) { - kbd_test::OneRow *pOneRow = objRowStyle_Src.add_row(); + iot_test::OneRow *pOneRow = objRowStyle_Src.add_row(); pOneRow->set_int32_val(nRowCnt); pOneRow->set_int64_val(nRowCnt); @@ -182,8 +182,8 @@ void otherTest() std::cout << "pField_Src->size() == " << pField_Src->size() << std::endl; std::cout << "pField_Src->Capacity() == " << pField_Src->Capacity() << std::endl; - kbd_test::RowStyle objRowStyle_Dest; - google::protobuf::RepeatedPtrField *pField_Dest = objRowStyle_Dest.mutable_row(); + iot_test::RowStyle objRowStyle_Dest; + google::protobuf::RepeatedPtrField *pField_Dest = objRowStyle_Dest.mutable_row(); bool bAdd = true; diff --git a/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.cc b/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.cc index 79777b7e..af49bace 100644 --- a/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.cc +++ b/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_test { +namespace iot_test { namespace { @@ -142,14 +142,14 @@ void protobuf_AddDesc_test_5fdata_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\017test_data.proto\022\010kbd_test\"\350\001\n\006OneRow\022\021" + "\n\017test_data.proto\022\010iot_test\"\350\001\n\006OneRow\022\021" "\n\tint32_val\030\001 \002(\005\022\021\n\tint64_val\030\002 \002(\003\022\022\n\n" "uint32_val\030\003 \002(\r\022\022\n\nuint64_val\030\004 \002(\004\022\022\n\n" "sint32_val\030\005 \002(\021\022\022\n\nsint64_val\030\006 \002(\022\022\023\n\013" "fixed32_val\030\007 \002(\007\022\023\n\013fixed64_val\030\010 \002(\006\022\024" "\n\014sfixed32_val\030\t \002(\017\022\024\n\014sfixed64_val\030\n \002" "(\020\022\022\n\nstring_val\030\013 \002(\t\")\n\010RowStyle\022\035\n\003ro" - "w\030\001 \003(\0132\020.kbd_test.OneRow\"\352\001\n\010ColStyle\022\021" + "w\030\001 \003(\0132\020.iot_test.OneRow\"\352\001\n\010ColStyle\022\021" "\n\tint32_val\030\001 \003(\005\022\021\n\tint64_val\030\002 \003(\003\022\022\n\n" "uint32_val\030\003 \003(\r\022\022\n\nuint64_val\030\004 \003(\004\022\022\n\n" "sint32_val\030\005 \003(\021\022\022\n\nsint64_val\030\006 \003(\022\022\023\n\013" @@ -193,7 +193,7 @@ const int OneRow::kStringValFieldNumber; OneRow::OneRow() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_test.OneRow) + // @@protoc_insertion_point(constructor:iot_test.OneRow) } void OneRow::InitAsDefaultInstance() { @@ -203,7 +203,7 @@ OneRow::OneRow(const OneRow& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_test.OneRow) + // @@protoc_insertion_point(copy_constructor:iot_test.OneRow) } void OneRow::SharedCtor() { @@ -224,7 +224,7 @@ void OneRow::SharedCtor() { } OneRow::~OneRow() { - // @@protoc_insertion_point(destructor:kbd_test.OneRow) + // @@protoc_insertion_point(destructor:iot_test.OneRow) SharedDtor(); } @@ -292,7 +292,7 @@ bool OneRow::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_test.OneRow) + // @@protoc_insertion_point(parse_start:iot_test.OneRow) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -478,17 +478,17 @@ bool OneRow::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_test.OneRow) + // @@protoc_insertion_point(parse_success:iot_test.OneRow) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_test.OneRow) + // @@protoc_insertion_point(parse_failure:iot_test.OneRow) return false; #undef DO_ } void OneRow::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_test.OneRow) + // @@protoc_insertion_point(serialize_start:iot_test.OneRow) // required int32 int32_val = 1; if (has_int32_val()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->int32_val(), output); @@ -553,12 +553,12 @@ void OneRow::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_test.OneRow) + // @@protoc_insertion_point(serialize_end:iot_test.OneRow) } ::google::protobuf::uint8* OneRow::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_test.OneRow) + // @@protoc_insertion_point(serialize_to_array_start:iot_test.OneRow) // required int32 int32_val = 1; if (has_int32_val()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->int32_val(), target); @@ -624,7 +624,7 @@ void OneRow::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_test.OneRow) + // @@protoc_insertion_point(serialize_to_array_end:iot_test.OneRow) return target; } @@ -824,7 +824,7 @@ const int RowStyle::kRowFieldNumber; RowStyle::RowStyle() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_test.RowStyle) + // @@protoc_insertion_point(constructor:iot_test.RowStyle) } void RowStyle::InitAsDefaultInstance() { @@ -834,7 +834,7 @@ RowStyle::RowStyle(const RowStyle& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_test.RowStyle) + // @@protoc_insertion_point(copy_constructor:iot_test.RowStyle) } void RowStyle::SharedCtor() { @@ -843,7 +843,7 @@ void RowStyle::SharedCtor() { } RowStyle::~RowStyle() { - // @@protoc_insertion_point(destructor:kbd_test.RowStyle) + // @@protoc_insertion_point(destructor:iot_test.RowStyle) SharedDtor(); } @@ -883,13 +883,13 @@ bool RowStyle::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_test.RowStyle) + // @@protoc_insertion_point(parse_start:iot_test.RowStyle) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_test.OneRow row = 1; + // repeated .iot_test.OneRow row = 1; case 1: { if (tag == 10) { parse_row: @@ -917,18 +917,18 @@ bool RowStyle::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_test.RowStyle) + // @@protoc_insertion_point(parse_success:iot_test.RowStyle) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_test.RowStyle) + // @@protoc_insertion_point(parse_failure:iot_test.RowStyle) return false; #undef DO_ } void RowStyle::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_test.RowStyle) - // repeated .kbd_test.OneRow row = 1; + // @@protoc_insertion_point(serialize_start:iot_test.RowStyle) + // repeated .iot_test.OneRow row = 1; for (int i = 0; i < this->row_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->row(i), output); @@ -938,13 +938,13 @@ void RowStyle::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_test.RowStyle) + // @@protoc_insertion_point(serialize_end:iot_test.RowStyle) } ::google::protobuf::uint8* RowStyle::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_test.RowStyle) - // repeated .kbd_test.OneRow row = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_test.RowStyle) + // repeated .iot_test.OneRow row = 1; for (int i = 0; i < this->row_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -955,14 +955,14 @@ void RowStyle::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_test.RowStyle) + // @@protoc_insertion_point(serialize_to_array_end:iot_test.RowStyle) return target; } int RowStyle::ByteSize() const { int total_size = 0; - // repeated .kbd_test.OneRow row = 1; + // repeated .iot_test.OneRow row = 1; total_size += 1 * this->row_size(); for (int i = 0; i < this->row_size(); i++) { total_size += @@ -1054,7 +1054,7 @@ const int ColStyle::kStringValFieldNumber; ColStyle::ColStyle() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_test.ColStyle) + // @@protoc_insertion_point(constructor:iot_test.ColStyle) } void ColStyle::InitAsDefaultInstance() { @@ -1064,7 +1064,7 @@ ColStyle::ColStyle(const ColStyle& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_test.ColStyle) + // @@protoc_insertion_point(copy_constructor:iot_test.ColStyle) } void ColStyle::SharedCtor() { @@ -1074,7 +1074,7 @@ void ColStyle::SharedCtor() { } ColStyle::~ColStyle() { - // @@protoc_insertion_point(destructor:kbd_test.ColStyle) + // @@protoc_insertion_point(destructor:iot_test.ColStyle) SharedDtor(); } @@ -1124,7 +1124,7 @@ bool ColStyle::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_test.ColStyle) + // @@protoc_insertion_point(parse_start:iot_test.ColStyle) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1353,17 +1353,17 @@ bool ColStyle::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_test.ColStyle) + // @@protoc_insertion_point(parse_success:iot_test.ColStyle) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_test.ColStyle) + // @@protoc_insertion_point(parse_failure:iot_test.ColStyle) return false; #undef DO_ } void ColStyle::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_test.ColStyle) + // @@protoc_insertion_point(serialize_start:iot_test.ColStyle) // repeated int32 int32_val = 1; for (int i = 0; i < this->int32_val_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteInt32( @@ -1438,12 +1438,12 @@ void ColStyle::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_test.ColStyle) + // @@protoc_insertion_point(serialize_end:iot_test.ColStyle) } ::google::protobuf::uint8* ColStyle::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_test.ColStyle) + // @@protoc_insertion_point(serialize_to_array_start:iot_test.ColStyle) // repeated int32 int32_val = 1; for (int i = 0; i < this->int32_val_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: @@ -1518,7 +1518,7 @@ void ColStyle::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_test.ColStyle) + // @@protoc_insertion_point(serialize_to_array_end:iot_test.ColStyle) return target; } @@ -1706,6 +1706,6 @@ void ColStyle::Swap(ColStyle* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_test +} // namespace iot_test // @@protoc_insertion_point(global_scope) diff --git a/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.h b/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.h index 49637660..cff7f559 100644 --- a/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.h +++ b/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.pb.h @@ -26,7 +26,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_test { +namespace iot_test { // Internal implementation detail -- do not call these. void protobuf_AddDesc_test_5fdata_2eproto(); @@ -174,7 +174,7 @@ class OneRow : public ::google::protobuf::Message { inline ::std::string* release_string_val(); inline void set_allocated_string_val(::std::string* string_val); - // @@protoc_insertion_point(class_scope:kbd_test.OneRow) + // @@protoc_insertion_point(class_scope:iot_test.OneRow) private: inline void set_has_int32_val(); inline void clear_has_int32_val(); @@ -276,26 +276,26 @@ class RowStyle : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_test.OneRow row = 1; + // repeated .iot_test.OneRow row = 1; inline int row_size() const; inline void clear_row(); static const int kRowFieldNumber = 1; - inline const ::kbd_test::OneRow& row(int index) const; - inline ::kbd_test::OneRow* mutable_row(int index); - inline ::kbd_test::OneRow* add_row(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_test::OneRow >& + inline const ::iot_test::OneRow& row(int index) const; + inline ::iot_test::OneRow* mutable_row(int index); + inline ::iot_test::OneRow* add_row(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_test::OneRow >& row() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_test::OneRow >* + inline ::google::protobuf::RepeatedPtrField< ::iot_test::OneRow >* mutable_row(); - // @@protoc_insertion_point(class_scope:kbd_test.RowStyle) + // @@protoc_insertion_point(class_scope:iot_test.RowStyle) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_test::OneRow > row_; + ::google::protobuf::RepeatedPtrField< ::iot_test::OneRow > row_; friend void protobuf_AddDesc_test_5fdata_2eproto(); friend void protobuf_AssignDesc_test_5fdata_2eproto(); friend void protobuf_ShutdownFile_test_5fdata_2eproto(); @@ -494,7 +494,7 @@ class ColStyle : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& string_val() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_string_val(); - // @@protoc_insertion_point(class_scope:kbd_test.ColStyle) + // @@protoc_insertion_point(class_scope:iot_test.ColStyle) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -541,13 +541,13 @@ inline void OneRow::clear_int32_val() { clear_has_int32_val(); } inline ::google::protobuf::int32 OneRow::int32_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.int32_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.int32_val) return int32_val_; } inline void OneRow::set_int32_val(::google::protobuf::int32 value) { set_has_int32_val(); int32_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.int32_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.int32_val) } // required int64 int64_val = 2; @@ -565,13 +565,13 @@ inline void OneRow::clear_int64_val() { clear_has_int64_val(); } inline ::google::protobuf::int64 OneRow::int64_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.int64_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.int64_val) return int64_val_; } inline void OneRow::set_int64_val(::google::protobuf::int64 value) { set_has_int64_val(); int64_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.int64_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.int64_val) } // required uint32 uint32_val = 3; @@ -589,13 +589,13 @@ inline void OneRow::clear_uint32_val() { clear_has_uint32_val(); } inline ::google::protobuf::uint32 OneRow::uint32_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.uint32_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.uint32_val) return uint32_val_; } inline void OneRow::set_uint32_val(::google::protobuf::uint32 value) { set_has_uint32_val(); uint32_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.uint32_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.uint32_val) } // required uint64 uint64_val = 4; @@ -613,13 +613,13 @@ inline void OneRow::clear_uint64_val() { clear_has_uint64_val(); } inline ::google::protobuf::uint64 OneRow::uint64_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.uint64_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.uint64_val) return uint64_val_; } inline void OneRow::set_uint64_val(::google::protobuf::uint64 value) { set_has_uint64_val(); uint64_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.uint64_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.uint64_val) } // required sint32 sint32_val = 5; @@ -637,13 +637,13 @@ inline void OneRow::clear_sint32_val() { clear_has_sint32_val(); } inline ::google::protobuf::int32 OneRow::sint32_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.sint32_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.sint32_val) return sint32_val_; } inline void OneRow::set_sint32_val(::google::protobuf::int32 value) { set_has_sint32_val(); sint32_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.sint32_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.sint32_val) } // required sint64 sint64_val = 6; @@ -661,13 +661,13 @@ inline void OneRow::clear_sint64_val() { clear_has_sint64_val(); } inline ::google::protobuf::int64 OneRow::sint64_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.sint64_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.sint64_val) return sint64_val_; } inline void OneRow::set_sint64_val(::google::protobuf::int64 value) { set_has_sint64_val(); sint64_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.sint64_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.sint64_val) } // required fixed32 fixed32_val = 7; @@ -685,13 +685,13 @@ inline void OneRow::clear_fixed32_val() { clear_has_fixed32_val(); } inline ::google::protobuf::uint32 OneRow::fixed32_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.fixed32_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.fixed32_val) return fixed32_val_; } inline void OneRow::set_fixed32_val(::google::protobuf::uint32 value) { set_has_fixed32_val(); fixed32_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.fixed32_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.fixed32_val) } // required fixed64 fixed64_val = 8; @@ -709,13 +709,13 @@ inline void OneRow::clear_fixed64_val() { clear_has_fixed64_val(); } inline ::google::protobuf::uint64 OneRow::fixed64_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.fixed64_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.fixed64_val) return fixed64_val_; } inline void OneRow::set_fixed64_val(::google::protobuf::uint64 value) { set_has_fixed64_val(); fixed64_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.fixed64_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.fixed64_val) } // required sfixed32 sfixed32_val = 9; @@ -733,13 +733,13 @@ inline void OneRow::clear_sfixed32_val() { clear_has_sfixed32_val(); } inline ::google::protobuf::int32 OneRow::sfixed32_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.sfixed32_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.sfixed32_val) return sfixed32_val_; } inline void OneRow::set_sfixed32_val(::google::protobuf::int32 value) { set_has_sfixed32_val(); sfixed32_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.sfixed32_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.sfixed32_val) } // required sfixed64 sfixed64_val = 10; @@ -757,13 +757,13 @@ inline void OneRow::clear_sfixed64_val() { clear_has_sfixed64_val(); } inline ::google::protobuf::int64 OneRow::sfixed64_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.sfixed64_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.sfixed64_val) return sfixed64_val_; } inline void OneRow::set_sfixed64_val(::google::protobuf::int64 value) { set_has_sfixed64_val(); sfixed64_val_ = value; - // @@protoc_insertion_point(field_set:kbd_test.OneRow.sfixed64_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.sfixed64_val) } // required string string_val = 11; @@ -783,7 +783,7 @@ inline void OneRow::clear_string_val() { clear_has_string_val(); } inline const ::std::string& OneRow::string_val() const { - // @@protoc_insertion_point(field_get:kbd_test.OneRow.string_val) + // @@protoc_insertion_point(field_get:iot_test.OneRow.string_val) return *string_val_; } inline void OneRow::set_string_val(const ::std::string& value) { @@ -792,7 +792,7 @@ inline void OneRow::set_string_val(const ::std::string& value) { string_val_ = new ::std::string; } string_val_->assign(value); - // @@protoc_insertion_point(field_set:kbd_test.OneRow.string_val) + // @@protoc_insertion_point(field_set:iot_test.OneRow.string_val) } inline void OneRow::set_string_val(const char* value) { set_has_string_val(); @@ -800,7 +800,7 @@ inline void OneRow::set_string_val(const char* value) { string_val_ = new ::std::string; } string_val_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_test.OneRow.string_val) + // @@protoc_insertion_point(field_set_char:iot_test.OneRow.string_val) } inline void OneRow::set_string_val(const char* value, size_t size) { set_has_string_val(); @@ -808,14 +808,14 @@ inline void OneRow::set_string_val(const char* value, size_t size) { string_val_ = new ::std::string; } string_val_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_test.OneRow.string_val) + // @@protoc_insertion_point(field_set_pointer:iot_test.OneRow.string_val) } inline ::std::string* OneRow::mutable_string_val() { set_has_string_val(); if (string_val_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { string_val_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_test.OneRow.string_val) + // @@protoc_insertion_point(field_mutable:iot_test.OneRow.string_val) return string_val_; } inline ::std::string* OneRow::release_string_val() { @@ -839,40 +839,40 @@ inline void OneRow::set_allocated_string_val(::std::string* string_val) { clear_has_string_val(); string_val_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_test.OneRow.string_val) + // @@protoc_insertion_point(field_set_allocated:iot_test.OneRow.string_val) } // ------------------------------------------------------------------- // RowStyle -// repeated .kbd_test.OneRow row = 1; +// repeated .iot_test.OneRow row = 1; inline int RowStyle::row_size() const { return row_.size(); } inline void RowStyle::clear_row() { row_.Clear(); } -inline const ::kbd_test::OneRow& RowStyle::row(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.RowStyle.row) +inline const ::iot_test::OneRow& RowStyle::row(int index) const { + // @@protoc_insertion_point(field_get:iot_test.RowStyle.row) return row_.Get(index); } -inline ::kbd_test::OneRow* RowStyle::mutable_row(int index) { - // @@protoc_insertion_point(field_mutable:kbd_test.RowStyle.row) +inline ::iot_test::OneRow* RowStyle::mutable_row(int index) { + // @@protoc_insertion_point(field_mutable:iot_test.RowStyle.row) return row_.Mutable(index); } -inline ::kbd_test::OneRow* RowStyle::add_row() { - // @@protoc_insertion_point(field_add:kbd_test.RowStyle.row) +inline ::iot_test::OneRow* RowStyle::add_row() { + // @@protoc_insertion_point(field_add:iot_test.RowStyle.row) return row_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_test::OneRow >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_test::OneRow >& RowStyle::row() const { - // @@protoc_insertion_point(field_list:kbd_test.RowStyle.row) + // @@protoc_insertion_point(field_list:iot_test.RowStyle.row) return row_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_test::OneRow >* +inline ::google::protobuf::RepeatedPtrField< ::iot_test::OneRow >* RowStyle::mutable_row() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.RowStyle.row) + // @@protoc_insertion_point(field_mutable_list:iot_test.RowStyle.row) return &row_; } @@ -888,25 +888,25 @@ inline void ColStyle::clear_int32_val() { int32_val_.Clear(); } inline ::google::protobuf::int32 ColStyle::int32_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.int32_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.int32_val) return int32_val_.Get(index); } inline void ColStyle::set_int32_val(int index, ::google::protobuf::int32 value) { int32_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.int32_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.int32_val) } inline void ColStyle::add_int32_val(::google::protobuf::int32 value) { int32_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.int32_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.int32_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& ColStyle::int32_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.int32_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.int32_val) return int32_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* ColStyle::mutable_int32_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.int32_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.int32_val) return &int32_val_; } @@ -918,25 +918,25 @@ inline void ColStyle::clear_int64_val() { int64_val_.Clear(); } inline ::google::protobuf::int64 ColStyle::int64_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.int64_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.int64_val) return int64_val_.Get(index); } inline void ColStyle::set_int64_val(int index, ::google::protobuf::int64 value) { int64_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.int64_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.int64_val) } inline void ColStyle::add_int64_val(::google::protobuf::int64 value) { int64_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.int64_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.int64_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int64 >& ColStyle::int64_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.int64_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.int64_val) return int64_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int64 >* ColStyle::mutable_int64_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.int64_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.int64_val) return &int64_val_; } @@ -948,25 +948,25 @@ inline void ColStyle::clear_uint32_val() { uint32_val_.Clear(); } inline ::google::protobuf::uint32 ColStyle::uint32_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.uint32_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.uint32_val) return uint32_val_.Get(index); } inline void ColStyle::set_uint32_val(int index, ::google::protobuf::uint32 value) { uint32_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.uint32_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.uint32_val) } inline void ColStyle::add_uint32_val(::google::protobuf::uint32 value) { uint32_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.uint32_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.uint32_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& ColStyle::uint32_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.uint32_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.uint32_val) return uint32_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* ColStyle::mutable_uint32_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.uint32_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.uint32_val) return &uint32_val_; } @@ -978,25 +978,25 @@ inline void ColStyle::clear_uint64_val() { uint64_val_.Clear(); } inline ::google::protobuf::uint64 ColStyle::uint64_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.uint64_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.uint64_val) return uint64_val_.Get(index); } inline void ColStyle::set_uint64_val(int index, ::google::protobuf::uint64 value) { uint64_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.uint64_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.uint64_val) } inline void ColStyle::add_uint64_val(::google::protobuf::uint64 value) { uint64_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.uint64_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.uint64_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint64 >& ColStyle::uint64_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.uint64_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.uint64_val) return uint64_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::uint64 >* ColStyle::mutable_uint64_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.uint64_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.uint64_val) return &uint64_val_; } @@ -1008,25 +1008,25 @@ inline void ColStyle::clear_sint32_val() { sint32_val_.Clear(); } inline ::google::protobuf::int32 ColStyle::sint32_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.sint32_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.sint32_val) return sint32_val_.Get(index); } inline void ColStyle::set_sint32_val(int index, ::google::protobuf::int32 value) { sint32_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.sint32_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.sint32_val) } inline void ColStyle::add_sint32_val(::google::protobuf::int32 value) { sint32_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.sint32_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.sint32_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& ColStyle::sint32_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.sint32_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.sint32_val) return sint32_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* ColStyle::mutable_sint32_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.sint32_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.sint32_val) return &sint32_val_; } @@ -1038,25 +1038,25 @@ inline void ColStyle::clear_sint64_val() { sint64_val_.Clear(); } inline ::google::protobuf::int64 ColStyle::sint64_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.sint64_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.sint64_val) return sint64_val_.Get(index); } inline void ColStyle::set_sint64_val(int index, ::google::protobuf::int64 value) { sint64_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.sint64_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.sint64_val) } inline void ColStyle::add_sint64_val(::google::protobuf::int64 value) { sint64_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.sint64_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.sint64_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int64 >& ColStyle::sint64_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.sint64_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.sint64_val) return sint64_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int64 >* ColStyle::mutable_sint64_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.sint64_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.sint64_val) return &sint64_val_; } @@ -1068,25 +1068,25 @@ inline void ColStyle::clear_fixed32_val() { fixed32_val_.Clear(); } inline ::google::protobuf::uint32 ColStyle::fixed32_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.fixed32_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.fixed32_val) return fixed32_val_.Get(index); } inline void ColStyle::set_fixed32_val(int index, ::google::protobuf::uint32 value) { fixed32_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.fixed32_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.fixed32_val) } inline void ColStyle::add_fixed32_val(::google::protobuf::uint32 value) { fixed32_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.fixed32_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.fixed32_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& ColStyle::fixed32_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.fixed32_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.fixed32_val) return fixed32_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* ColStyle::mutable_fixed32_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.fixed32_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.fixed32_val) return &fixed32_val_; } @@ -1098,25 +1098,25 @@ inline void ColStyle::clear_fixed64_val() { fixed64_val_.Clear(); } inline ::google::protobuf::uint64 ColStyle::fixed64_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.fixed64_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.fixed64_val) return fixed64_val_.Get(index); } inline void ColStyle::set_fixed64_val(int index, ::google::protobuf::uint64 value) { fixed64_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.fixed64_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.fixed64_val) } inline void ColStyle::add_fixed64_val(::google::protobuf::uint64 value) { fixed64_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.fixed64_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.fixed64_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint64 >& ColStyle::fixed64_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.fixed64_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.fixed64_val) return fixed64_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::uint64 >* ColStyle::mutable_fixed64_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.fixed64_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.fixed64_val) return &fixed64_val_; } @@ -1128,25 +1128,25 @@ inline void ColStyle::clear_sfixed32_val() { sfixed32_val_.Clear(); } inline ::google::protobuf::int32 ColStyle::sfixed32_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.sfixed32_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.sfixed32_val) return sfixed32_val_.Get(index); } inline void ColStyle::set_sfixed32_val(int index, ::google::protobuf::int32 value) { sfixed32_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.sfixed32_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.sfixed32_val) } inline void ColStyle::add_sfixed32_val(::google::protobuf::int32 value) { sfixed32_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.sfixed32_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.sfixed32_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& ColStyle::sfixed32_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.sfixed32_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.sfixed32_val) return sfixed32_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* ColStyle::mutable_sfixed32_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.sfixed32_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.sfixed32_val) return &sfixed32_val_; } @@ -1158,25 +1158,25 @@ inline void ColStyle::clear_sfixed64_val() { sfixed64_val_.Clear(); } inline ::google::protobuf::int64 ColStyle::sfixed64_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.sfixed64_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.sfixed64_val) return sfixed64_val_.Get(index); } inline void ColStyle::set_sfixed64_val(int index, ::google::protobuf::int64 value) { sfixed64_val_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.sfixed64_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.sfixed64_val) } inline void ColStyle::add_sfixed64_val(::google::protobuf::int64 value) { sfixed64_val_.Add(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.sfixed64_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.sfixed64_val) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int64 >& ColStyle::sfixed64_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.sfixed64_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.sfixed64_val) return sfixed64_val_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int64 >* ColStyle::mutable_sfixed64_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.sfixed64_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.sfixed64_val) return &sfixed64_val_; } @@ -1188,56 +1188,56 @@ inline void ColStyle::clear_string_val() { string_val_.Clear(); } inline const ::std::string& ColStyle::string_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_get:iot_test.ColStyle.string_val) return string_val_.Get(index); } inline ::std::string* ColStyle::mutable_string_val(int index) { - // @@protoc_insertion_point(field_mutable:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_mutable:iot_test.ColStyle.string_val) return string_val_.Mutable(index); } inline void ColStyle::set_string_val(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_set:iot_test.ColStyle.string_val) string_val_.Mutable(index)->assign(value); } inline void ColStyle::set_string_val(int index, const char* value) { string_val_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_set_char:iot_test.ColStyle.string_val) } inline void ColStyle::set_string_val(int index, const char* value, size_t size) { string_val_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_set_pointer:iot_test.ColStyle.string_val) } inline ::std::string* ColStyle::add_string_val() { return string_val_.Add(); } inline void ColStyle::add_string_val(const ::std::string& value) { string_val_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_add:iot_test.ColStyle.string_val) } inline void ColStyle::add_string_val(const char* value) { string_val_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_add_char:iot_test.ColStyle.string_val) } inline void ColStyle::add_string_val(const char* value, size_t size) { string_val_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_add_pointer:iot_test.ColStyle.string_val) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& ColStyle::string_val() const { - // @@protoc_insertion_point(field_list:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_list:iot_test.ColStyle.string_val) return string_val_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* ColStyle::mutable_string_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_test.ColStyle.string_val) + // @@protoc_insertion_point(field_mutable_list:iot_test.ColStyle.string_val) return &string_val_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_test +} // namespace iot_test #ifndef SWIG namespace google { diff --git a/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.proto b/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.proto index 5a0cb650..4b22ee52 100644 --- a/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.proto +++ b/platform/src/service/alarm_server/test/pb_row_vs_col/test_data.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax = "proto2"; -package kbd_test; +package iot_test; message OneRow { required int32 int32_val = 1; diff --git a/platform/src/service/interlock_api/InterLockImpl.cpp b/platform/src/service/interlock_api/InterLockImpl.cpp index fb7a84bc..625bd6e0 100644 --- a/platform/src/service/interlock_api/InterLockImpl.cpp +++ b/platform/src/service/interlock_api/InterLockImpl.cpp @@ -66,7 +66,7 @@ int CInterLockImpl::initialize() @param const char *strCtrlPointName IN:需要进行互锁判断的测点,一般为控制点,如AO,DO,MO等 string &strInterlockResult OUT 返回结果字符串 string &bInterlockSuccess OUT 返回结果,成功/失败 - @return 成功返回kbdSucces,失败返回 iotFailed + @return 成功返回iotSucces,失败返回 iotFailed */ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double dTargValue, string &strResult, bool &bSuccess) { @@ -124,7 +124,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double const vector &vecInterlockKey:IN 输入参数队列 VECTOR string &strInterlockResult OUT 返回结果字符串 string &bInterlockSuccess OUT 返回结果,成功/失败 - @return 成功返回kbdSucces,失败返回 iotFailed + @return 成功返回iotSucces,失败返回 iotFailed */ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const double dTargValue,const int nInterlockNum, const vector &vecInterLockInPara, string &strInterlockResult, bool &bInterlockSuccess) @@ -220,7 +220,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const doubl /** @brief 通过标签点获取标签点的状态和值 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int CInterLockImpl::GetValueStatusName(const std::string &strTagName, SOptValueStatus &stValueStatus,\ iot_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId ,int nAppNo) @@ -397,7 +397,7 @@ int CInterLockImpl::SplitTagName(char *strTagName , const char *strDelimit,std:: } /** @brief 通过表名称获得表的类型 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int CInterLockImpl::GetPointTypeByTableName(const string &strTableName) { diff --git a/platform/src/service/interlock_api/InterLockImpl.h b/platform/src/service/interlock_api/InterLockImpl.h index 224fd2db..df765ff6 100644 --- a/platform/src/service/interlock_api/InterLockImpl.h +++ b/platform/src/service/interlock_api/InterLockImpl.h @@ -37,31 +37,31 @@ namespace iot_service public: /** @brief 初始化 - @return 成功返回kbdSucces,失败返回iotFailed + @return 成功返回iotSucces,失败返回iotFailed */ int initialize(); /** @brief 判断联锁关系 - @return 成功返回kbdSucces,失败返回iotFailed + @return 成功返回iotSucces,失败返回iotFailed */ int CheckCtrlInterlock(const char *strCtrlPointName, const double dTargValue,std::string &strResult, bool &bSuccess); private: /** @brief 判断联锁关系 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int CheckCtrlInterlock(const char *strInterlockName, const double dTargValue,const int nInterlockNum, const std::vector &vecInterLockInPara, std::string &strResult, bool &bSuccess); /** @brief 通过标签点获取标签点的状态和值 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int GetValueStatusName(const std::string &strTagName, SOptValueStatus &stValueStatus,\ iot_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId=-1 ,int nAppNo=-1); /** @brief 通过LULA脚本计算连锁结果 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ //int CtrlInterlockLuaCalc(const std::string &strInterlock,const std::vector &vecValueStatus, // const std::vector &vecName,std::string &strInterlockResult, bool &bInterlockSuccess); @@ -78,7 +78,7 @@ namespace iot_service int SplitTagName(char *strTagName , const char *strDelimit,std::vector &vecStr); /** @brief 通过表名称获得表的类型 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int GetPointTypeByTableName(const std::string &strTableName); }; diff --git a/platform/src/service/operate_server/OperateServerClass.cpp b/platform/src/service/operate_server/OperateServerClass.cpp index a589036e..b0fba998 100644 --- a/platform/src/service/operate_server/OperateServerClass.cpp +++ b/platform/src/service/operate_server/OperateServerClass.cpp @@ -313,7 +313,7 @@ int COperateServerClass::getUserAndUserGroup(const int nUserId,const int nUsergI /** @brief 通过标签点获取标签点的状态和值 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int COperateServerClass::getValueStatus(const std::string &strTagName, SOptValueStatus &stValueStatus,\ int nDomainId ,int nAppNo) diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp index c6e8449c..3a287126 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp +++ b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp @@ -75,7 +75,7 @@ int iot_sys::CDogAuthImpl::checkAuthStatus() /** @brief 检查License授权状态 -@return 成功返回kbdSucces,失败返回相应错误码 +@return 成功返回iotSucces,失败返回相应错误码 */ int iot_sys::CDogAuthImpl::checLicenseAuthStatus() { @@ -118,7 +118,7 @@ int iot_sys::CDogAuthImpl::checLicenseAuthStatus() /** @brief 检查超级狗授权状态 -@return 成功返回kbdSucces,失败返回相应错误码 +@return 成功返回iotSucces,失败返回相应错误码 */ int iot_sys::CDogAuthImpl::checkDogAuthStatus() { diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h index a69e7d86..2f96e2ad 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h +++ b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h @@ -24,26 +24,26 @@ namespace iot_sys /** @brief 检查系统授权状态 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ virtual int checkAuthStatus() override; /** @brief 初始化 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int initialize(); protected: /** @brief 检查超级狗授权状态 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int checkDogAuthStatus(); /** @brief 检查License授权状态 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int checLicenseAuthStatus(); diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h index 82581b50..c63a60af 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h +++ b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h @@ -48,14 +48,14 @@ namespace iot_sys /** @brief 向进程管理注册进程信息 @param const SProcessInfoKey & stProcKey 进程标识主键 - @return 成功返回kbdSucces,失败返回iotFailed + @return 成功返回iotSucces,失败返回iotFailed @retval */ //int registerProcInfo(const SProcessInfoKey &stProcKey); /** @brief 初始化 - @return 成功返回kbdSucces,失败返回相应错误码 + @return 成功返回iotSucces,失败返回相应错误码 */ int initialize();