diff --git a/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.h b/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.h index 5522b6519158524ca22876a19b64ae794cb62a25..c6ca9ed76c8218b3768b12887ae1323af5ef361d 100644 --- a/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.h +++ b/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.h @@ -50,7 +50,7 @@ private: void Rotate2d(GLfloat centerX, GLfloat centerY, GLfloat* rotateX, GLfloat* rotateY, GLfloat theta); bool FinishDraw(); GLuint loadTexture(); - void checkCompileErrors(unsigned int shader, std::string type); + void CheckCompileErrors(unsigned int shader, std::string type); void display(GLuint texID); private: diff --git a/examples/pluginCase/serviceCode/NodeISayHello.cpp b/examples/pluginCase/serviceCode/NodeISayHello.cpp index 92740b49615a03e8b62179c6296840d67160aafb..93b84c51552f2ca1e28f58956c8e11a7f77e753d 100644 --- a/examples/pluginCase/serviceCode/NodeISayHello.cpp +++ b/examples/pluginCase/serviceCode/NodeISayHello.cpp @@ -28,12 +28,12 @@ // 工具提供的业务接口(回调) void NodeISayHello::SayHelloListenerSayHelloStartCallback(SayInfo& info) // 3. 调用注册的NodeISayHelloListenerSayHelloEnd(info: SayInfo)方法 // 工具提供的业务接口(回调) void NodeISayHello::SayHelloListenerSayHelloEndCallback(SayInfo& info) -void NodeISayHello::sayHello(std::string& from, std::string& to, uint32_t& sayType) +void NodeISayHello::SayHello(std::string& from, std::string& to, uint32_t& sayType) { // 1.打印 - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHello from=%{public}s", from.c_str()); - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHello to=%{public}s", to.c_str()); - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHello sayType=%{public}d", sayType); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHello from=%{public}s", from.c_str()); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHello to=%{public}s", to.c_str()); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHello sayType=%{public}d", sayType); // 2.调用回调 napitest::napitest_interface::SayInfo info1; @@ -69,12 +69,12 @@ void NodeISayHello::sayHello(std::string& from, std::string& to, uint32_t& sayTy } // 调用register注册的回调 -void NodeISayHello::sayHi(std::string& from, std::string& to, uint32_t& sayType) +void NodeISayHello::SayHi(std::string& from, std::string& to, uint32_t& sayType) { // 1.打印 - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHi from=%{public}s", from.c_str()); - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHi to=%{public}s", to.c_str()); - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHi sayType=%{public}d", sayType); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHi from=%{public}s", from.c_str()); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHi to=%{public}s", to.c_str()); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHi sayType=%{public}d", sayType); // 2.调用回调 napitest::napitest_interface::NodeISayHello *ptr = new napitest::napitest_interface::NodeISayHello(); uint32_t callbackNum = 58; @@ -84,7 +84,7 @@ void NodeISayHello::sayHi(std::string& from, std::string& to, uint32_t& sayType) } // 普通函数调用,返回str -std::string funcTest(bool& v) +std::string FuncTest(bool& v) { if (v) { return "true"; @@ -95,12 +95,12 @@ std::string funcTest(bool& v) // 1.打印值:from, to 以及枚举enum SayType的值 // 2. 将回调值(0, "", "recv hello.")的值传回Js层 -void NodeISayHello::sayHelloWithResponse(std::string& from, std::string& to, uint32_t& sayType) +void NodeISayHello::SayHelloWithResponse(std::string& from, std::string& to, uint32_t& sayType) { // 1.打印 - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHelloWithResponse from=%{public}s", from.c_str()); - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHelloWithResponse to=%{public}s", to.c_str()); - OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI sayHelloWithResponse sayType=%{public}d", sayType); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHelloWithResponse from=%{public}s", from.c_str()); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHelloWithResponse to=%{public}s", to.c_str()); + OH_LOG_INFO(LOG_APP, "NAPITEST_LOGI SayHelloWithResponse sayType=%{public}d", sayType); // 2.调用promise回调 (0, "", "recv hello.") napitest::napitest_interface::NodeISayHello *p = new napitest::napitest_interface::NodeISayHello(); // 调用工具接口将回调传回工具 diff --git a/examples/pluginCase/serviceCode/NodeISayHello.h b/examples/pluginCase/serviceCode/NodeISayHello.h index 0c145af2fdae16c6d60d59828dc472b775efa082..61b6711a6e52d07831eaeda729e5748a23e3a326 100644 --- a/examples/pluginCase/serviceCode/NodeISayHello.h +++ b/examples/pluginCase/serviceCode/NodeISayHello.h @@ -22,10 +22,10 @@ namespace napitest { class NodeISayHello; class NodeISayHello { public: - void sayHello(std::string& from, std::string& to, uint32_t& sayType); - void sayHi(std::string& from, std::string& to, uint32_t& sayType); - void sayHelloWithResponse(std::string& from, std::string& to, uint32_t& sayType); + void SayHello(std::string& from, std::string& to, uint32_t& sayType); + void SayHi(std::string& from, std::string& to, uint32_t& sayType); + void SayHelloWithResponse(std::string& from, std::string& to, uint32_t& sayType); }; -std::string funcTest(bool& v); +std::string FuncTest(bool& v); } #endif // IMPL_NODEISAYHELLO_H \ No newline at end of file