diff --git a/weex_core/Source/android/wrap/native_render_object_utils_impl_android.cpp b/weex_core/Source/android/wrap/native_render_object_utils_impl_android.cpp
index 5565075..eb30d90 100644
--- a/weex_core/Source/android/wrap/native_render_object_utils_impl_android.cpp
+++ b/weex_core/Source/android/wrap/native_render_object_utils_impl_android.cpp
@@ -79,7 +79,7 @@
 
 static  void showRenderObjectLayout(RenderObject *renderObject, int level){
     LOGE("RenderObject layout %s %d %p %f %f %f %f ", renderObject->type().c_str(),
-         renderObject->getStypePositionType(),
+         renderObject->getStylePositionType(),
          renderObject, renderObject->getLayoutHeight(), renderObject->getLayoutWidth(),
          renderObject->getLayoutPositionLeft(), renderObject->getLayoutPositionRight());
 
@@ -171,11 +171,11 @@
                                    jboolean waster){
     RenderObject* renderObject = convert_long_to_render_object(ptr);
     if(waster){
-        if(renderObject->getStypePositionType() != WXCorePositionType::kFixed){
+        if(renderObject->getStylePositionType() != WXCorePositionType::kFixed){
             renderObject->setStylePositionType(WXCorePositionType::kFixed);
         }
     }else{
-        if(renderObject->getStypePositionType() != WXCorePositionType::kRelative){
+        if(renderObject->getStylePositionType() != WXCorePositionType::kRelative){
             renderObject->setStylePositionType(WXCorePositionType::kRelative);
         }
     }
