Merge pull request #3 from ywenjing/ohos-compose-ywjing

Ohos compose ywjing

Author: ywenjing

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_export.cpp

@@ -51,6 +51,13 @@ void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRect(OHNativeCanvas
     LOGI("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRect");
 }
 
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, float radiusX, float radiusY, OHComposeNativePaint_Handle paint) {
+    LOGI("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect: start");
+    auto nativePaint = reinterpret_cast<androidx::compose::ui::arkui::utils::OHComposeNativePaint *>(paint);
+    auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxy);
+    canvasProxy->drawRoundRect(left, top, right, bottom, radiusX, radiusY, nativePaint);
+}
+
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine(OHNativeCanvasProxy_Handle proxy, float x1, float y1, float x2, float y2, OHComposeNativePaint_Handle paint) {
     auto nativePaint = reinterpret_cast<androidx::compose::ui::arkui::utils::OHComposeNativePaint *>(paint);
     auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxy);

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_export.h

@@ -53,6 +53,7 @@ void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setParent(OHNativeCanva
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine(OHNativeCanvasProxy_Handle proxy, float x1, float y1, float x2, float y2, OHComposeNativePaint_Handle paint);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayerWithSubproxy(OHNativeCanvasProxy_Handle proxy, OHNativeCanvasProxy_Handle subProxy);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_clipRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, uint32_t clipOp);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, float radiusX, float radiusY, OHComposeNativePaint_Handle paint);
 
 // OHComposeNativePaint set paint properties
 void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setAlpha(OHComposeNativePaint_Handle paint, float alpha);

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_layer_drawer.cpp

@@ -130,10 +130,49 @@ void OHRenderNodeDrawClipRect(float left, float top, float right, float bottom,
     }
 }
 
+    void OHRenderNodeDrawRoundRect(float left, float top, float right, float bottom,
+            float radiusX, float radiusY,
+            NativeBasicShader* shader,
+            const RenderNodeSaveState* saveState,
+            BaseRenderNode* renderNodeForDrawing,
+            androidx::compose::ui::arkui::utils::OHComposeNativePaint* paint) {
+        const float strokeWidth = paint->strokeWidth;
+        int32_t x = (left + strokeWidth);
+        int32_t y = (top + strokeWidth);
+
+        int32_t width = (right - left + strokeWidth);
+        int32_t height = (bottom - top + strokeWidth);
+
+        renderNodeForDrawing
+            ->setTransform(const_cast<float*>(saveState->transform.data()))
+            ->setTranslate(saveState->translateX, saveState->translateY)
+            ->setPosition(x, y)
+            ->setSize(width, height)
+            ->setBorderCornerRadius(radiusX);
+        if (!shader) {
+            //TODO：setMask(0)会导致不显示，需要了解具体怎么传值
+            //renderNodeForDrawing->setMask(0);
+            if (paint->style == OH_Native_Draw_PaintingStyle::OH_NATIVE_PAINTING_STYLE_STROKE) {
+                renderNodeForDrawing
+                        ->setBorderWidth(strokeWidth)
+                        ->setBorderColor(paint->color)
+                        ->setBackgroundColor(CLEAR_COLOR);
+            } else {
+                renderNodeForDrawing->setBorderWidth(0)
+                                //TODO:需要通过paint获取颜色
+                        ->setBackgroundColor(paint->color);
+            }
+        } else {
+
+        }
+    }
+
 void OHRenderNodeDrawLine(float x1, float y1, float x2, float y2,
-                          OH_Drawing_ShaderEffect *shader,
+                          NativeBasicShader* shader,
                           const RenderNodeSaveState *saveState,
-                          BaseRenderNode *renderNodeForDrawing) {
+                          BaseRenderNode *renderNodeForDrawing,
+                          androidx::compose::ui::arkui::utils::OHComposeNativePaint* paint) {
+    const float strokeWidth = paint->strokeWidth;
     int32_t x = std::min(x1, x2);
     int32_t y = std::min(y1, y2);
     int32_t width = abs(x2 - x1);
@@ -146,15 +185,7 @@ void OHRenderNodeDrawLine(float x1, float y1, float x2, float y2,
         ->setSize(width, height);
 
     if (!shader) {
-        renderNodeForDrawing->drawLine(x1, y1, x2, y2);
-        //            [(TMMNativeLineLayer *)layerForDrawing drawWithPointX1:pointX1
-        //            pointY1:pointY1
-        //            pointX2:pointX2
-        //            pointY2:pointY2
-        //            lineWidth:[paint strokeWidth]
-        //            lineColor:[paint colorFromColorValue]
-        //            strokeCap:[paint strokeCap]
-        //            density:density];
+        renderNodeForDrawing->drawLine(x1, y1, x2, y2, strokeWidth, paint->color, paint->strokeCap);
     } else {
         //            [(TMMNativeLineGradientLayer *)layerForDrawing drawWithPointX1:pointX1
         //            pointY1:pointY1

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_layer_drawer.h

@@ -15,10 +15,18 @@ void OHRenderNodeDrawRect(float left, float top, float right, float bottom,
                           BaseRenderNode *renderNodeForDrawing,
                           androidx::compose::ui::arkui::utils::OHComposeNativePaint *paint);
 
+void OHRenderNodeDrawRoundRect(float left, float top, float right, float bottom,
+                               float roundX, float roundY,
+                                NativeBasicShader* shader,
+                                const RenderNodeSaveState *saveState,
+                                BaseRenderNode* renderNodeForDrawing,
+                                androidx::compose::ui::arkui::utils::OHComposeNativePaint* paint);
+
 void OHRenderNodeDrawLine(float x1, float y1, float x2, float y2,
                           NativeBasicShader *shader,
                           const RenderNodeSaveState *saveState,
-                          BaseRenderNode *renderNodeForDrawing);
+                          BaseRenderNode *renderNodeForDrawing,
+                          androidx::compose::ui::arkui::utils::OHComposeNativePaint* paint);
 
 void OHRenderNodeDrawClipRect(float left, float top, float right, float bottom,
                               const RenderNodeSaveState *saveState,

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_proxy.cpp

@@ -145,6 +145,22 @@ namespace androidx::compose::ui::arkui::utils {
         }
     }
 
+    void OHNativeCanvasProxy::drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, OHComposeNativePaint* paint) {
+        LOGI("OHNativeCanvasProxy::drawRoundRect: start");
+        OH::NativeBasicShader* shader = paint->shader;
+        const OH::OHNativeDrawingType drawingType = shader ? OH::OHNativeDrawingType::ShaderRect : OH::OHNativeDrawingType::Rect;
+        //    const uint64_t preHash = hashMerge(TMMNativeDataHashFromPaint(paint), drawingType);
+                const uint64_t preHash = 0;
+        const uint64_t drawingContentHash = OH::hashCombineSequential(left, top, right, bottom, static_cast<float>(preHash));
+        OH::PictureRecorderUpdateInfo updateItem = _pictureRecorder.draw(drawingType, drawingContentHash);
+        bool isDirty = updateItem.isDirty;
+        OH::BaseRenderNode *renderNodeForDrawing = nullptr;
+        if (isDirty) {
+            renderNodeForDrawing = _pictureRecorder.getOrCreateRenderNodeForDrawing(updateItem.drawingType, updateItem.itemHash);
+            OH::OHRenderNodeDrawRoundRect(left, top, right, bottom, radiusX, radiusY, shader, &(updateItem.saveState), renderNodeForDrawing, paint);
+        }
+    }
+    
     void OHNativeCanvasProxy::drawLine(float x1, float y1, float x2, float y2, OHComposeNativePaint* paint) {
         LOGI("OHNativeCanvasProxy::drawLine: start");
         //TODO:需要paint
@@ -158,8 +174,8 @@ namespace androidx::compose::ui::arkui::utils {
         bool isDirty = updateItem.isDirty;
         OH::BaseRenderNode *renderNodeForDrawing = nullptr;
         if (isDirty) {
-            renderNodeForDrawing = _pictureRecorder.getOrCreateLayerForDrawing(updateItem.drawingType, updateItem.itemHash);
-            OH::OHRenderNodeDrawLine(x1, y1, x2, y2, paint->shader, &(updateItem.saveState), renderNodeForDrawing);
+            renderNodeForDrawing = _pictureRecorder.getOrCreateRenderNodeForDrawing(updateItem.drawingType, updateItem.itemHash);
+            OH::OHRenderNodeDrawLine(x1, y1, x2, y2, paint->shader, &(updateItem.saveState), renderNodeForDrawing, paint);
         }
     }
 

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_proxy.h

@@ -28,6 +28,7 @@ class OHNativeCanvasProxy {
     void setOpacity(float opacity);
 
     void drawRect(float left, float top, float right, float bottom, OHComposeNativePaint* paint);
+    void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, OHComposeNativePaint* paint);
     void drawLine(float x1, float y1, float x2, float y2, OHComposeNativePaint* paint);
     void drawLayer(OH::BaseRenderNode* renderNode);
     void clipRect(float left, float top, float right, float bottom, OH_Native_Draw_ClipOp clipOp);

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/render_node/oh_base_render_node.h

@@ -10,6 +10,7 @@
 #include <native_drawing/drawing_pen.h>
 #include <native_drawing/drawing_canvas.h>
 #include "../xcomponent_log.h"
+#include "../canvas/oh_native_enums.h"
 
 namespace OH {
     class BaseRenderNode {
@@ -166,39 +167,79 @@ namespace OH {
             return this;
         }
 
-        BaseRenderNode* drawLine(float x1, float y1, float x2, float y2) {
-            struct UserData {
-                float x1;
-                float y1;
-                float x2;
-                float y2;
+        BaseRenderNode *drawLine(float x1, float y1, float x2, float y2, float lineWidth,
+                                 uint32_t lineColor, OH_Native_Draw_StrokeCap stokeCap) {
+            // Property的作用是触发set更新，同步更新modifier的Draw方法。
+            struct AnimatableUserData {
+                ArkUI_Vector2AnimatablePropertyHandle p1;
+                ArkUI_Vector2AnimatablePropertyHandle p2;
+                ArkUI_FloatAnimatablePropertyHandle width;
+                ArkUI_ColorAnimatablePropertyHandle color;
+                OH_Native_Draw_StrokeCap capStyle;
             };
-            UserData* data = new UserData{
-                .x1 = x1,
-                .y1 = y1,
-                .x2 = x2,
-                .y2 = y2
-            };
-            //ArkUI_RenderContentModifierHandle
+            // 设置基础值。
+            AnimatableUserData *userData1 = new AnimatableUserData;
+            auto vectorAnimP1 = OH_ArkUI_RenderNodeUtils_CreateVector2AnimatableProperty(x1, y1);
+            userData1->p1 = vectorAnimP1;
+            auto vectorAnimP2 = OH_ArkUI_RenderNodeUtils_CreateVector2AnimatableProperty(x2, y2);
+            userData1->p2 = vectorAnimP2;
+            auto widthP = OH_ArkUI_RenderNodeUtils_CreateFloatAnimatableProperty(lineWidth);
+            userData1->width = widthP;
+            auto colorP = OH_ArkUI_RenderNodeUtils_CreateColorAnimatableProperty(lineColor);
+            userData1->color = colorP;
+            userData1->capStyle = stokeCap;
+            // 关联组件和多个modifier。
             auto modifier = OH_ArkUI_RenderNodeUtils_CreateContentModifier();
-
             maybeThrow(OH_ArkUI_RenderNodeUtils_AttachContentModifier(nodeHandle_, modifier));
-            maybeThrow(OH_ArkUI_RenderNodeUtils_SetContentModifierOnDraw(modifier, data, [](ArkUI_DrawContext *context, void *userData) {
-                UserData* data = static_cast<UserData*>(userData);
+            // 关联modifier和property。
+            OH_ArkUI_RenderNodeUtils_AttachVector2AnimatableProperty(modifier, vectorAnimP1);
+            OH_ArkUI_RenderNodeUtils_AttachVector2AnimatableProperty(modifier, vectorAnimP2);
+            OH_ArkUI_RenderNodeUtils_AttachFloatAnimatableProperty(modifier, widthP);
+            OH_ArkUI_RenderNodeUtils_AttachColorAnimatableProperty(modifier, colorP);
+            maybeThrow(OH_ArkUI_RenderNodeUtils_SetContentModifierOnDraw(modifier, userData1,
+                                                                         [](ArkUI_DrawContext *context,void *userData) {
+                AnimatableUserData *data = static_cast<AnimatableUserData *>(userData);
                 auto *canvas1 = OH_ArkUI_DrawContext_GetCanvas(context);
                 OH_Drawing_Canvas *canvas = reinterpret_cast<OH_Drawing_Canvas *>(canvas1);
 
                 auto path = OH_Drawing_PathCreate();
-                OH_Drawing_PathMoveTo(path, data -> x1, data -> y1);
-                OH_Drawing_PathLineTo(path, data -> x2, data -> y2);
+                float x1F = 0;
+                float y1F = 0;
+                float x2F = 0;
+                float y2F = 0;
+                float widthF = 0;
+                uint32_t lineColor = 0;
+                OH_Drawing_PenLineCapStyle lineCapStyle = OH_Drawing_PenLineCapStyle::LINE_FLAT_CAP;
+
+                ArkUI_Vector2AnimatablePropertyHandle p1 = data->p1;
+                ArkUI_Vector2AnimatablePropertyHandle p2 = data->p2;
+                ArkUI_FloatAnimatablePropertyHandle width = data->width;
+                ArkUI_ColorAnimatablePropertyHandle cp = data->color;
+                OH_Native_Draw_StrokeCap nativeStokeCap = data->capStyle;
+
+
+                OH_ArkUI_RenderNodeUtils_GetVector2AnimatablePropertyValue(p1, &x1F, &y1F);
+                OH_ArkUI_RenderNodeUtils_GetVector2AnimatablePropertyValue(p2, &x2F, &y2F);
+                OH_ArkUI_RenderNodeUtils_GetFloatAnimatablePropertyValue(width, &widthF);
+                OH_ArkUI_RenderNodeUtils_GetColorAnimatablePropertyValue(cp, &lineColor);
+                if (nativeStokeCap == OH_Native_Draw_StrokeCap::OH_NATIVE_STROKE_CAP_ROUND) {
+                    lineCapStyle = OH_Drawing_PenLineCapStyle::LINE_ROUND_CAP;
+                } else if(nativeStokeCap == OH_Native_Draw_StrokeCap::OH_NATIVE_STROKE_CAP_SQUARE) {
+                    lineCapStyle = OH_Drawing_PenLineCapStyle::LINE_SQUARE_CAP;
+                }
+
+                OH_Drawing_PathMoveTo(path, x1F,y1F);
+                OH_Drawing_PathLineTo(path, x2F,y2F);
                 OH_Drawing_PathClose(path);
+
                 auto pen = OH_Drawing_PenCreate();
-                //TODO：暂时写死
-                OH_Drawing_PenSetWidth(pen, 10);
-                OH_Drawing_PenSetColor(pen, OH_Drawing_ColorSetArgb(0xFF, 0xFF, 0x00, 0x00));
+                OH_Drawing_PenSetWidth(pen, widthF);
+                OH_Drawing_PenSetColor(pen, lineColor);
+                OH_Drawing_PenSetCap(pen, lineCapStyle);
                 OH_Drawing_CanvasAttachPen(canvas, pen);
                 OH_Drawing_CanvasDrawPath(canvas, path);
-            }));
+             }));
+            return this;
         }
 
         uint32_t getHash() const {

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/platform/nativefoundation/AdaptiveCanvas.ohos.kt

@@ -244,7 +244,8 @@ internal class AdaptiveCanvas(factory: COpaquePointer) : OHOSNativeCanvas {
         radiusY: Float,
         paint: Paint
     ) {
-        // TODO("Not yet implemented")
+        nativePaint.sync(paint)
+        nativeCanvasProxy.drawRoundRect(left, top, right, bottom, radiusX, radiusY, nativePaint)
         LogPrintUtil.verbose(
             "AdaptiveCanvas::drawRoundRect, " +
                     "left: $left, top: $top, right: $right, bottom: $bottom, " +

compose/ui/ui/src/ohosArm64Main/kotlin/androidx/compose/ui/platform/nativefoundation/OHNativeCanvasProxy.kt

@@ -12,6 +12,7 @@ import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeC
 import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayerWithSubproxy
 import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setParent
 import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine
+import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect
 import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_restore
 import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_save
 import androidx.compose.ui.arkui.utils.androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setBounds
@@ -146,6 +147,13 @@ class OHNativeCanvasProxy(private val handle: OHNativeCanvasProxy_Handle?) {
         }
     }
 
+    /**
+     * 绘制圆角矩形
+     */
+    fun drawRoundRect(left: Float, top: Float, right: Float, bottom: Float, radiusX: Float, radiusY: Float, nativePaint: OHComposeNativePaint) {
+        handle?.let { androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect(it, left, top, right, bottom, radiusX, radiusY, nativePaint.handle) }
+    }
+
     fun drawLine(x1: Float, y1: Float, x2: Float, y2: Float, nativePaint: OHComposeNativePaint) {
         handle?.let {
             androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine(