ohos: Enhance AdaptiveCanvas with drawParagraph method and improve native canvas proxy resource management

Author: sebuntin

compose/common/src/androidMain/kotlin/androidx/compose/common/interop/LogPrintUtil.android.kt

@@ -24,4 +24,8 @@ actual object LogPrintUtil {
     actual fun verbose(message: String) {
         println(message)
     }
+
+    actual var isLogEnabled: Boolean
+        get() = TODO("Not yet implemented")
+        set(value) {}
 }

compose/common/src/commonMain/kotlin/androidx/compose/common/interop/LogPrintUtil.kt

@@ -22,5 +22,6 @@ interface LogPrintInterface {
 
 expect object LogPrintUtil {
     var logPrintImpl: LogPrintInterface?
+    var isLogEnabled: Boolean
     fun verbose(message: String)
 }

compose/common/src/ohosArm64Main/kotlin/androidx/compose/common/interop/LogPrintUtil.ohosArm64.kt

@@ -21,6 +21,7 @@ import platform.ohos.LOG_DEBUG
 import platform.ohos.OH_LOG_Print
 
 actual object LogPrintUtil {
+    private var _isLogEnabled: Boolean = true
 
     private val DefaultLogger = object : LogPrintInterface {
         override fun verbose(message: String) {
@@ -36,6 +37,14 @@ actual object LogPrintUtil {
     actual var logPrintImpl: LogPrintInterface? = DefaultLogger
 
     actual fun verbose(message: String) {
-        this.logPrintImpl?.verbose(message)
+        if (isLogEnabled) {
+            this.logPrintImpl?.verbose(message)
+        }
     }
+
+    actual var isLogEnabled: Boolean
+        get() = _isLogEnabled
+        set(value) {
+            _isLogEnabled = value
+        }
 }

compose/common/src/uikitMain/kotlin/androidx/compose/common/interop/LogPrintUtil.darwin.kt

@@ -19,6 +19,7 @@ package androidx.compose.common.interop
 import platform.Foundation.NSLog
 
 actual object LogPrintUtil {
+    private var _isLogEnabled: Boolean = false
     private val DefaultLogger = object : LogPrintInterface {
         override fun verbose(message: String) {
             NSLog(message)
@@ -28,6 +29,14 @@ actual object LogPrintUtil {
     actual var logPrintImpl: LogPrintInterface? = DefaultLogger
 
     actual fun verbose(message: String) {
-        this.logPrintImpl?.verbose("[shiqi]${message}")
+        if (isLogEnabled) {
+            this.logPrintImpl?.verbose("[shiqi]${message}")
+        }
     }
+
+    actual var isLogEnabled: Boolean
+        get() = _isLogEnabled
+        set(value) {
+            _isLogEnabled = value
+        }
 }

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

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-#include "napi/native_api.h"
+#include <napi/native_api.h>
+#include "../constants/oh_native_constants.h"
 #include "../xcomponent_log.h"
 #include "oh_native_canvas_export.h"
 #include "oh_native_canvas_proxy.h"
@@ -37,9 +38,23 @@ OHNativeCanvasProxy_Handle androidx_compose_ui_arkui_utils_createOHNativeCanvasP
     LOGI("androidx_compose_ui_arkui_utils_createOHNativeCanvasProxy");
 }
 
+void androidx_compose_ui_arkui_utils_DisposeOHNativeCanvasProxy(OHNativeCanvasProxy_Handle proxyHandle) {
+    auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxyHandle);
+    LOGI("androidx_compose_ui_arkui_utils_DisposeOHNativeCanvasProxy %{public}p", canvasProxy);
+    // delete canvasProxy here to avoid memory leak
+    delete canvasProxy;
+};
+
+void androidx_compose_ui_arkui_utils_DisposeOHComposeNativePaint(OHComposeNativePaint_Handle paintHandle) {
+    auto paint = reinterpret_cast<androidx::compose::ui::arkui::utils::OHComposeNativePaint *>(paintHandle);
+    LOGI("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_DisposeOHComposeNativePaint %{public}p", paint);
+    // delete paint here to avoid memory leak
+    delete paint;
+};
+
 /// OHNativeCanvasProxy drawing methods
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_beginDraw(OHNativeCanvasProxy_Handle proxy) {
-    auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxy);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_beginDraw(OHNativeCanvasProxy_Handle proxyHandle) {
+    auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxyHandle);
     canvasProxy->beginDraw();
     LOGI("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_beginDraw");
 }
@@ -78,6 +93,18 @@ void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayer(OHNativeCanva
     LOGI("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayer");
 }
 
+
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawParagraph(OHNativeCanvasProxy_Handle proxy, BaseRenderNode_Handle paragraphHandle) {
+    auto paragraph = reinterpret_cast<OH::BaseRenderNode *>(paragraphHandle);
+    auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxy);
+    if (paragraph->getType() != OH_DrawingNode_Type::ParagraphNode) {
+        LOGE("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawParagraph: invalid paragraph node type");
+        throw std::invalid_argument("Invalid paragraph node type");
+    }
+    canvasProxy->drawParagraph(dynamic_cast<OH::Paragraph*>(paragraph));
+    LOGI("androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawParagraph");
+}
+
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_attachToRootView(OHNativeCanvasProxy_Handle proxy) {
     auto canvasProxy = reinterpret_cast<androidx::compose::ui::arkui::utils::OHNativeCanvasProxy *>(proxy);
     canvasProxy->attachToRootView();

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

@@ -26,8 +26,10 @@
 
 EXTERN_C_START
 OHNativeCanvasProxy_Handle androidx_compose_ui_arkui_utils_createOHNativeCanvasProxy(void *factory);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_beginDraw(OHNativeCanvasProxy_Handle proxy);
+void androidx_compose_ui_arkui_utils_DisposeOHNativeCanvasProxy(OHNativeCanvasProxy_Handle proxyHandle);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_beginDraw(OHNativeCanvasProxy_Handle proxyHandle);
 OHComposeNativePaint_Handle androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_Paint(OHNativeCanvasProxy_Handle proxy);
+void androidx_compose_ui_arkui_utils_DisposeOHComposeNativePaint(OHComposeNativePaint_Handle paintHandle);
 
 // OHNativeCanvasProxy state operations
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_save(OHNativeCanvasProxy_Handle proxy);
@@ -42,6 +44,7 @@ void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setOpacity(OHNativeCanv
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, OHComposeNativePaint_Handle paint);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_finishDraw(OHNativeCanvasProxy_Handle proxy);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayer(OHNativeCanvasProxy_Handle proxy, BaseRenderNode_Handle renderNodeHandle);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawParagraph(OHNativeCanvasProxy_Handle proxy, BaseRenderNode_Handle paragraphHandle);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_attachToRootView(OHNativeCanvasProxy_Handle proxy);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setParent(OHNativeCanvasProxy_Handle proxy, OHNativeCanvasProxy_Handle parentProxy);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine(OHNativeCanvasProxy_Handle proxy, float x1, float y1, float x2, float y2, OHComposeNativePaint_Handle paint);

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

@@ -120,12 +120,15 @@ void OHRenderNodeDrawText(const RenderNodeSaveState *saveState, Paragraph *parag
     const float originY = saveState->translateY;
     const int32_t width = paragraphNode->getWidth();
     const int32_t height = paragraphNode->getHeight();
+//    LOGI("Transform matrix: %{public}s", saveState->transform.toReadableString().c_str());
+    
     paragraphNode->setTransform(saveState->transform.data())
-        ->setTranslate(saveState->translateX, saveState->translateY)
-        ->setPosition(originX, originY)
+        ->setTranslate(originX, originY)
+        ->setPosition(originX, originY)  
         ->setSize(width, height);
-    LOGI("OHRenderNodeDrawText: start drawing paragraph, setTranslate: %{public}f, %{public}f, setSize: "
-         "%{public}d, %{public}d",
+    
+    LOGI("OHRenderNodeDrawText: start drawing paragraph, translateX/Y: %{public}f, %{public}f, "
+         "position: 0, 0, size: %{public}d, %{public}d, transform applied",
          originX, originY, width, height);
     paragraphNode->paint(0, 0);
 }

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

@@ -106,7 +106,8 @@ void OHNativeCanvasProxy::translate(float dx, float dy) { _pictureRecorder.trans
 void OHNativeCanvasProxy::drawLayerWithSubproxy(OHNativeCanvasProxy *subproxy) {
     LOGI("OHNativeCanvasProxy::drawLayerWithSubproxy: start");
     if (subproxy->canvasNode_ != nullptr) {
-        _pictureRecorder.drawRenderNode(subproxy->canvasNode_.get());
+        auto canvasNode = subproxy->canvasNode_.get();
+        _pictureRecorder.drawRenderNode(canvasNode, canvasNode->getType());
     }
 }
 
@@ -181,14 +182,18 @@ void OHNativeCanvasProxy::drawLine(float x1, float y1, float x2, float y2, OHCom
             _pictureRecorder.getOrCreateRenderNodeForDrawing(updateItem.drawingType, updateItem.itemHash);
         OH::OHRenderNodeDrawLine(x1, y1, x2, y2, paint->shader, &(updateItem.saveState), renderNodeForDrawing, paint);
     }
-}
+};
 
 void OHNativeCanvasProxy::drawLayer(OH::BaseRenderNode *renderNode) {
-    OH::PictureRecorderUpdateInfo updateItem = _pictureRecorder.drawRenderNode(renderNode);
-    // TODO：ios上传入了CALayer，oh需要对应的renderNode？
-    if (typeid(*renderNode) == typeid(OH::Paragraph)) {
-        OH::OHRenderNodeDrawText(&(updateItem.saveState), (OH::Paragraph *)renderNode);
-        LOGI("OHRenderNodeDrawText, paragraphNode hash: %{public}lu", updateItem.itemHash);
+    OH::PictureRecorderUpdateInfo updateItem = _pictureRecorder.drawRenderNode(renderNode, renderNode->getType());
+};
+
+void OHNativeCanvasProxy::drawParagraph(OH::Paragraph *paragraph) {
+    LOGI("OHNativeCanvasProxy::drawParagraph: start %{public}f", paragraph->getHeight());
+    OH::PictureRecorderUpdateInfo updateItem = _pictureRecorder.drawRenderNode(paragraph, paragraph->getType());
+    bool isDirty = updateItem.isDirty;
+    if (isDirty) {
+        OH::OHRenderNodeDrawText(&(updateItem.saveState), paragraph);
     }
 };
 

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

@@ -1,7 +1,7 @@
 #ifndef ANDROIDX_COMPOSE_UI_ARKUI_UTILS_OHNATIVECANVASPROXY_H
 #define ANDROIDX_COMPOSE_UI_ARKUI_UTILS_OHNATIVECANVASPROXY_H
 
-#include "arkui/native_render.h"
+#include "../paragraph/oh_native_paragraph_builder.h"
 #include "oh_compose_native_paint.h"
 #include "../render_node/oh_base_render_node.h"
 #include "../picture_recorder/oh_native_picture_recorder.h"
@@ -13,7 +13,6 @@ class OHNativeCanvasProxy {
     explicit OHNativeCanvasProxy(OH::BaseRenderNode *rootNode);
     ~OHNativeCanvasProxy();
     OHComposeNativePaint* Paint();
-    void BeginDraw();
     OH::BaseRenderNode* getRenderNode();
     void beginDraw();
     void attachToRootView();
@@ -31,6 +30,7 @@ class OHNativeCanvasProxy {
     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 drawParagraph(OH::Paragraph* paragraph);	
     void clipRect(float left, float top, float right, float bottom, OH_Native_Draw_ClipOp clipOp);
     void drawLayerWithSubproxy(OHNativeCanvasProxy *subProxy);
 private:

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/constants/oh_native_enums.h

@@ -66,20 +66,39 @@ typedef enum {
     DrawingTypeShaderRowPoints,
     DrawingTypeRowVertices,
     DrawingTypeShaderRowVertices,
+    DrawingTypeDrawTextLayer,
     DrawingTypeDrawLayer,
     DrawingTypeSave,
     DrawingTypeRestore,
     DrawingTypeClip,
     DrawingTypePop
 } OH_Native_Drawing_Type;
 
+typedef enum {
+    BaseNode,
+    LineNode,
+    ParagraphNode,
+    LineGradientNode,
+    RectGradientNode
+    // TODO: 每实现一个BaseRenderNode的派生类，就需要在此处添加对应的枚举值
+} OH_DrawingNode_Type;
+
 // Enum to specify the type of RenderNode save state
 typedef enum {
     SafeGuard, // Safe guard
     Save,      // Pure save operation
     Clip       // Clip operation
 } OH_RenderNode_SaveState_MakeType;
 
+typedef enum {
+    NoneTypeShader,
+    LinearGradientShader,
+    RadialGradientShader,
+    SweepGradientShader,
+    ImageShader
+    // TODO: 每实现一个BasicShader的派生类，就需要在此处添加对应的枚举值
+} OH_Native_Shader_Type;
+
 typedef enum {
     PathOpDifference,
     PathOpIntersect,