@react-native-ohos/react-native-bindingx 1.0.4-rc.1 → 1.0.4-rc.2

package/README.OpenSource

@@ -1,11 +1,11 @@
-[
-    {
-        "Name": "react-native-bindingx",
-        "License": "Apache License",
-        "License File": "LICENSE.md",
-        "Version Number": "1.0.3",
-        "Owner" : "xiafeng@huawei.com",
-        "Upstream URL": "https://github.com/alibaba/bindingx",
-        "Description": "Bind actions to effects"
-    }
+[
+    {
+        "Name": "react-native-bindingx",
+        "License": "Apache License",
+        "License File": "LICENSE.md",
+        "Version Number": "1.0.3",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/alibaba/bindingx",
+        "Description": "Bind actions to effects"
+    }
 ]

package/README.md

@@ -1,6 +1,6 @@
-# @react-native-oh-tpl/react-native-bindingx
+# @react-native-ohos/react-native-bindingx
 
-This project is based on [alibaba/bindingx](https://github.com/alibaba/bindingx)
+This project is based on [alibaba/bindingx@1.0.3](https://github.com/alibaba/bindingx/tree/1.0.3)
 
 ## Documentation 
 

package/harmony/bindingx/index.ets

@@ -22,4 +22,6 @@
  * SOFTWARE.
  */
 
+import { ReactBindingXPackage } from './src/main/ets/ReactBindingXPackage'
 export * from "./ts"
+export default ReactBindingXPackage

package/harmony/bindingx/oh-package.json5

@@ -5,7 +5,7 @@
   name: '@react-native-ohos/react-native-bindingx',
   description: '',
   main: 'index.ets',
-  version: '1.0.4-rc.1',
+  version: '1.0.4-rc.2',
   dependencies: {
     "@rnoh/react-native-openharmony": 'file:../react_native_openharmony',
   },

package/harmony/bindingx/src/main/cpp/ExpressHandleEval.cpp

@@ -24,15 +24,16 @@
 
 #include "ExpressHandleEval.h"
 
+#define BINDINGX_EVAL_TWO 2
 namespace rnoh {
 
     string ops = "+-*/()";
-    bool ValueError = false;  
-    bool ExpressionError = false; 
+    bool ValueError = false;
+    bool ExpressionError = false;
     ExpressHandleEval *m_ExpressHandleEval;
 
-
-    double toDouble(string str) {
+    double toDouble(string str)
+    {
         double target;
         stringstream ss;
         ss << str;
@@ -41,27 +42,28 @@ namespace rnoh {
     }
 
 
-    void ExpressHandleEval::init_mapping(map<string, int> &mapping) {
+    void ExpressHandleEval::init_mapping(map<string, int> &mapping)
+    {
         mapping["+"] = 0;
         mapping["-"] = 0;
         mapping["*"] = 1;
         mapping["/"] = 1;
-        mapping["("] = 2;
-        mapping[")"] = 2;
+        mapping["("] = BINDINGX_EVAL_TWO;
+        mapping[")"] = BINDINGX_EVAL_TWO;
     }
 
 
-    vector<string> toPostfix(string formula) {
+    vector<string> toPostfix(string formula)
+    {
         vector<string> result;
         vector<string> op_stack;
-        string cur_num, cur_op;
+        string cur_num;
+        string cur_op;
 
         for (int i = 0; i < formula.size(); ++i) {
-            if (ops.find(formula[i]) == ops.npos) 
+            if (ops.find(formula[i]) == ops.npos) {
                 cur_num += formula[i];
-
-            else 
-            {
+            } else {
                 if (!cur_num.empty()) {
                     result.push_back(cur_num);
                     cur_num.clear();
@@ -69,43 +71,37 @@ namespace rnoh {
 
                 cur_op = formula[i];
 
-                if (op_stack.empty()) 
+                if (op_stack.empty()) {
                     op_stack.push_back(cur_op);
-                else if (cur_op == "(") 
+                } else if (cur_op == "(") {
                     op_stack.push_back(cur_op);
-
-                else if (cur_op == ")") 
-                {
+                } else if (cur_op == ")") {
                     while (op_stack.back() != "(") {
                         result.push_back(op_stack.back());
                         op_stack.pop_back();
 
-                        if (op_stack.empty()) 
-                        {
+                        if (op_stack.empty()) {
                             ExpressionError = true;
                             result.push_back("0");
                             return result;
                         }
                     }
-                    op_stack.pop_back(); 
-                } else if (op_stack.back() == "(") 
+                    op_stack.pop_back();
+                } else if (op_stack.back() == "(") {
                     op_stack.push_back(cur_op);
-                else if (
-                    ExpressHandleEval::getInstance()->op_mapping[cur_op] >
-                    ExpressHandleEval::getInstance()->op_mapping
-                        [op_stack
-                             .back()]) 
+                } else if (ExpressHandleEval::getInstance()->op_mapping[cur_op] >
+                           ExpressHandleEval::getInstance()->op_mapping[op_stack.back()]) {
                     op_stack.push_back(cur_op);
-                else 
-                {
+                } else {
                     while ((op_stack.back() != "(") && (ExpressHandleEval::getInstance()->op_mapping[op_stack.back()] >=
                                                         ExpressHandleEval::getInstance()->op_mapping[cur_op])) {
                         result.push_back(op_stack.back());
                         op_stack.pop_back();
-                        if (op_stack.empty())
+                        if (op_stack.empty()) {
                             break;
+                        }
                     }
-                    op_stack.push_back(cur_op); 
+                    op_stack.push_back(cur_op);
                 }
             }
         }
@@ -118,14 +114,14 @@ namespace rnoh {
 
         return result;
     }
-    double calculatePostfix(vector<string> &postfix) {
+    double calculatePostfix(vector<string> &postfix)
+    {
         vector<double> result;
         for (int i = 0; i < postfix.size(); ++i) {
-            if (ops.find(postfix[i]) == ops.npos) 
+            if (ops.find(postfix[i]) == ops.npos) {
                 result.push_back(toDouble(postfix[i]));
-            else
-            {
-                if (result.size() < 2) {
+            } else {
+                if (result.size() < BINDINGX_EVAL_TWO) {
                     ExpressionError = true;
                     return 0.0;
                 }
@@ -134,13 +130,13 @@ namespace rnoh {
                 double num2 = result.back();
                 result.pop_back();
                 double op_res;
-                if (postfix[i] == "+")
+                if (postfix[i] == "+") {
                     op_res = num2 + num1;
-                else if (postfix[i] == "-")
+                } else if (postfix[i] == "-") {
                     op_res = num2 - num1;
-                else if (postfix[i] == "*")
+                } else if (postfix[i] == "*") {
                     op_res = num2 * num1;
-                else if (postfix[i] == "/") {
+                } else if (postfix[i] == "/") {
                     if (num1 == 0) {
                         ValueError = true;
                         return 0.0;
@@ -151,21 +147,22 @@ namespace rnoh {
                 result.push_back(op_res);
             }
         }
-        if (result.size() == 1) 
+        if (result.size() == 1) {
             return result.back();
-        else 
-        {
+        } else {
             ExpressionError = true;
             return 0.0;
         }
     }
 
-    double ExpressHandleEval::eval(const string &infix) {
+    double ExpressHandleEval::eval(const string &infix)
+    {
         vector<string> postfix = toPostfix(infix);
         return calculatePostfix(postfix);
     }
 
-    ExpressHandleEval *ExpressHandleEval::getInstance() {
+    ExpressHandleEval *ExpressHandleEval::getInstance()
+    {
         if (!m_ExpressHandleEval) {
             m_ExpressHandleEval = new ExpressHandleEval();
         }

package/harmony/bindingx/src/main/cpp/ExpressHandleEval.h

@@ -26,7 +26,7 @@
 #define HARMONY_EXPRESSHANDLEEVAL_H
 
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -37,7 +37,7 @@ namespace rnoh {
     class ExpressHandleEval {
 
     public:
-        map<string, int> op_mapping; 
+        map<string, int> op_mapping;
 
     public:
         ExpressHandleEval() {}

package/harmony/bindingx/src/main/cpp/ReactBindingXModule.cpp

@@ -29,7 +29,9 @@
 namespace rnoh {
 using namespace facebook;
 
-ReactBindingXModule::ReactBindingXModule(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
+ReactBindingXModule::ReactBindingXModule(const ArkTSTurboModule::Context ctx, const std::string name)
+    : ArkTSTurboModule(ctx, name)
+{
     methodMap_ = {
         ARK_METHOD_METADATA(bind, 1),
         ARK_METHOD_METADATA(unbind, 1),

package/harmony/bindingx/src/main/cpp/ReactBindingXPackage.cpp

@@ -35,7 +35,8 @@ using namespace facebook;
 
 class ReactBindingXTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
 public:
-    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override
+    {
         if (name == "ReactBindingXModule") {
             return std::make_shared<ReactBindingXModule>(ctx, name);
         }
@@ -44,10 +45,12 @@ public:
 };
 
 
-std::unique_ptr<TurboModuleFactoryDelegate> ReactBindingXPackage::createTurboModuleFactoryDelegate() {
+std::unique_ptr<TurboModuleFactoryDelegate> ReactBindingXPackage::createTurboModuleFactoryDelegate()
+{
     return std::make_unique<ReactBindingXTurboModuleFactoryDelegate>();
 }
 
-std::vector<ArkTSMessageHandler::Shared> ReactBindingXPackage::createArkTSMessageHandlers() {
+std::vector<ArkTSMessageHandler::Shared> ReactBindingXPackage::createArkTSMessageHandlers()
+{
     return {std::make_shared<ReactBindingxArkTSMessageHandler>()};
 }

package/harmony/bindingx/src/main/cpp/ReactBindingXPackage.h

@@ -28,7 +28,7 @@
 namespace rnoh {
     class ReactBindingXPackage : public Package {
     public:
-        ReactBindingXPackage(Package::Context ctx) : Package(ctx) {}
+        explicit ReactBindingXPackage(Package::Context ctx) : Package(ctx) {}
 
         std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
     

package/harmony/bindingx/src/main/cpp/ReactBindingxArkTSMessageHandler.cpp

@@ -25,66 +25,77 @@
 #include <string>
 #include <vector>
 
-namespace rnoh
-{
+#define MESSAGE_HANDLER_THREE 3
 
+namespace rnoh {
     double scrollEvalValue;
     ReactBindingxArkTSMessageHandler *m_reactBindingxArkTSMessageHandler;
 
     int hex_char_value(char c)
     {
-        if (c >= '0' && c <= '9')
+        const int decimalBaseOffset = 10;
+        if (c >= '0' && c <= '9') {
             return c - '0';
-        else if (c >= 'a' && c <= 'f')
-            return (c - 'a' + 10);
-        else if (c >= 'A' && c <= 'F')
-            return (c - 'A' + 10);
+        } else if (c >= 'a' && c <= 'f') {
+            return (c - 'a' + decimalBaseOffset);
+        } else if (c >= 'A' && c <= 'F') {
+            return (c - 'A' + decimalBaseOffset);
+        }
         return 0;
     }
     int hex_to_decimal(const char *szHex, int len)
     {
+        const int hexBase = 16;
         int result = 0;
-        for (int i = 0; i < len; i++)
-        {
-            result += (int)pow((float)16, (int)len - i - 1) * hex_char_value(szHex[i]);
+        for (int i = 0; i < len; i++) {
+            result += static_cast<int>(pow(static_cast<float>(hexBase), static_cast<int>(len) - i - 1)) *
+                    hex_char_value(szHex[i]);
         }
         return result;
     }
     int evaluate(float fraction, int startValue, int endValue)
     {
         int startInt = startValue;
-        float startA = ((startInt >> 24) & 0xff) / 255.0;
-        float startR = ((startInt >> 16) & 0xff) / 255.0;
-        float startG = ((startInt >> 8) & 0xff) / 255.0;
-        float startB = (startInt & 0xff) / 255.0;
+
+        const int alphaShift = 24;
+        const int redShift = 16;
+        const int greenShift = 8;
+        const double colorNormalization = 255.0;
+        const double gammaEncode = 2.2;
+        const double gammaDecode = 1.0;
+        
+        float startA = ((startInt >> alphaShift) & 0xff) / colorNormalization;
+        float startR = ((startInt >> redShift) & 0xff) / colorNormalization;
+        float startG = ((startInt >> greenShift) & 0xff) / colorNormalization;
+        float startB = (startInt & 0xff) / colorNormalization;
 
         int endInt = endValue;
-        float endA = ((endInt >> 24) & 0xff) / 255.0;
-        float endR = ((endInt >> 16) & 0xff) / 255.0;
-        float endG = ((endInt >> 8) & 0xff) / 255.0;
-        float endB = (endInt & 0xff) / 255.0;
+        float endA = ((endInt >> alphaShift) & 0xff) / colorNormalization;
+        float endR = ((endInt >> redShift) & 0xff) / colorNormalization;
+        float endG = ((endInt >> greenShift) & 0xff) / colorNormalization;
+        float endB = (endInt & 0xff) / colorNormalization;
 
-        startR = pow(startR, 2.2);
-        startG = pow(startG, 2.2);
-        startB = pow(startB, 2.2);
+        startR = pow(startR, gammaEncode);
+        startG = pow(startG, gammaEncode);
+        startB = pow(startB, gammaEncode);
 
-        endR = pow(endR, 2.2);
-        endG = pow(endG, 2.2);
-        endB = pow(endB, 2.2);
+        endR = pow(endR, gammaEncode);
+        endG = pow(endG, gammaEncode);
+        endB = pow(endB, gammaEncode);
         float a = startA + fraction * (endA - startA);
         float r = startR + fraction * (endR - startR);
         float g = startG + fraction * (endG - startG);
         float b = startB + fraction * (endB - startB);
-        a = a * 255.0;
-        r = pow(r, 1.0 / 2.2) * 255.0;
-        g = pow(g, 1.0 / 2.2) * 255.0;
-        b = pow(b, 1.0 / 2.2) * 255.0;
+        a = a * colorNormalization;
+        r = pow(r, gammaDecode / gammaEncode) * colorNormalization;
+        g = pow(g, gammaDecode / gammaEncode) * colorNormalization;
+        b = pow(b, gammaDecode / gammaEncode) * colorNormalization;
 
         int ra = round(a);
         int rr = round(r);
         int rg = round(g);
         int rb = round(b);
-        return ra << 24 | rr << 16 | rg << 8 | rb;
+        return (ra << alphaShift) | (rr << redShift) | (rg << greenShift) | rb;
     }
 
     int minNum(int a, int b) { return a > b ? b : a; }
@@ -92,17 +103,16 @@ namespace rnoh
     std::vector<std::string> split(const std::string &src, const std::string &sep)
     {
         std::vector<std::string> tokens;
-        int lastPos = 0,
-            index, sepLen = sep.length();
-        while (-1 != (index = src.find(sep, lastPos)))
-        {
+        int lastPos = 0;
+        int index;
+        int sepLen = sep.length();
+        while (-1 != (index = src.find(sep, lastPos))) {
             tokens.push_back(src.substr(lastPos, index - lastPos));
             lastPos = index + sepLen;
         }
 
         std::string lastString = src.substr(lastPos);
-        if (!lastString.empty())
-        {
+        if (!lastString.empty()) {
             tokens.push_back(lastString);
         }
         return tokens;
@@ -111,13 +121,10 @@ namespace rnoh
     std::vector<std::string> findProperty(std::vector<std::string> propertyWords, std::vector<std::string> propertyAtr)
     {
         std::vector<std::string> result;
-        for (int i = 0; i < propertyAtr.size(); i++)
-        {
+        for (int i = 0; i < propertyAtr.size(); i++) {
             auto temp = propertyAtr[i];
-            for (int j = 0; j < propertyWords.size(); j++)
-            {
-                if (temp == propertyWords[j])
-                {
+            for (int j = 0; j < propertyWords.size(); j++) {
+                if (temp == propertyWords[j]) {
                     result.push_back(temp);
                 }
             }
@@ -127,17 +134,16 @@ namespace rnoh
 
     void ReactBindingxArkTSMessageHandler::handleScroll()
     {
+        const double angleScaleFactor = 0.03;
         auto panActionCallBack = ReactBindingxArkTSMessageHandler::getInstance()->m_panActionCallBack;
         auto scrollViewComponentInstance =
             std::dynamic_pointer_cast<rnoh::ScrollViewComponentInstance>(panActionCallBack->componentInstance);
 
         float scrollY = scrollViewComponentInstance->getScrollViewMetrics().contentOffset.y;
-        if (this->m_scrollY != scrollY)
-        {
+        if (this->m_scrollY != scrollY) {
             this->m_scrollY = scrollY;
         }
-        if (this->m_scrollY <= 0)
-        {
+        if (this->m_scrollY <= 0) {
             this->m_scrollY = 1;
             panActionCallBack->angle = 1;
         }
@@ -147,8 +153,7 @@ namespace rnoh
         roateMatchPropertys.push_back("transform.rotateX");
         roateMatchPropertys.push_back("transform.rotateY");
         std::vector<std::string> findRoateAtr = findProperty(roateMatchPropertys, panActionCallBack->propertyAtr);
-        if (findRoateAtr.size() > 0)
-        {
+        if (findRoateAtr.size() > 0) {
             ArkUI_NumberValue roateValue[] = {
                 {.f32 = 0}, {.f32 = 0}, {.f32 = 1}, {.f32 = static_cast<float>(this->m_scrollY)}, {.f32 = 0}};
             ArkUI_AttributeItem roateItem = {roateValue, sizeof(roateValue) / sizeof(ArkUI_NumberValue)};
@@ -157,24 +162,21 @@ namespace rnoh
                 NODE_ROTATE, &roateItem);
         }
         DLOG(INFO) << "ReactBindingXPackage::scroll getScrollViewMetrics y:" << this->m_scrollY
-                   << " scrollY:" << panActionCallBack->scrollY << " angle:" << panActionCallBack->angle
-                   << " width:" << scrollViewComponentInstance->getLayoutMetrics().frame.size.width;
+                  << " scrollY:" << panActionCallBack->scrollY << " angle:" << panActionCallBack->angle
+                  << " width:" << scrollViewComponentInstance->getLayoutMetrics().frame.size.width;
         float translate = this->m_scrollY;
-        std::array<ArkUI_NumberValue, 3> translateValue = {ArkUI_NumberValue{.f32 = translate}, {.f32 = 0}, {.f32 = 0}};
+        std::array<ArkUI_NumberValue, MESSAGE_HANDLER_THREE> translateValue = {ArkUI_NumberValue{.f32 = translate},
+            {.f32 = 0}, {.f32 = 0}};
         ArkUI_AttributeItem translateItem = {translateValue.data(), translateValue.size()};
         NativeNodeApi::getInstance()->setAttribute(
             panActionCallBack->elementViewComponentInstance->getLocalRootArkUINode().getArkUINodeHandle(),
             NODE_TRANSLATE, &translateItem);
 
-        if (panActionCallBack->scrollY != this->m_scrollY)
-        {
-            if (panActionCallBack->scrollY > this->m_scrollY)
-            {
-                panActionCallBack->angle = this->m_scrollY * 0.03;
-            }
-            else
-            {
-                panActionCallBack->angle = this->m_scrollY * 0.03;
+        if (panActionCallBack->scrollY != this->m_scrollY) {
+            if (panActionCallBack->scrollY > this->m_scrollY) {
+                panActionCallBack->angle = this->m_scrollY * angleScaleFactor;
+            } else {
+                panActionCallBack->angle = this->m_scrollY * angleScaleFactor;
             }
         }
         panActionCallBack->scrollY = this->m_scrollY;
@@ -183,18 +185,14 @@ namespace rnoh
         backgroundColorMatchPropertys.push_back("background-color");
         std::vector<std::string> findbackgroundColorAtr =
             findProperty(backgroundColorMatchPropertys, panActionCallBack->propertyAtr);
-        if (findbackgroundColorAtr.size() > 0 && panActionCallBack->backgroundcolor.c_str() != nullptr)
-        {
+        if (findbackgroundColorAtr.size() > 0 && panActionCallBack->backgroundcolor.c_str() != nullptr) {
             auto backgroundcolorAtr = split(panActionCallBack->backgroundcolor, ",");
-            if (panActionCallBack->angle < 1)
-            {
+            if (panActionCallBack->angle < 1) {
                 panActionCallBack->angle = 1;
                 std::string color = backgroundcolorAtr[0];
                 int color1 = hex_to_decimal(color.c_str(), color.size());
                 panActionCallBack->elementViewComponentInstance->getLocalRootArkUINode().setBackgroundColor(color1);
-            }
-            else
-            {
+            } else {
                 std::string color = backgroundcolorAtr[0];
                 int color1 = hex_to_decimal(color.c_str(), color.size());
                 std::string backgroundcolorEval = panActionCallBack->backgroundcolorEval;
@@ -221,8 +219,7 @@ namespace rnoh
         scaleMatchPropertys.push_back("transform.scaleX");
         scaleMatchPropertys.push_back("transform.scaleY");
         std::vector<std::string> findScaleAtr = findProperty(scaleMatchPropertys, panActionCallBack->propertyAtr);
-        if (findScaleAtr.size() > 0)
-        {
+        if (findScaleAtr.size() > 0) {
             ArkUI_NumberValue scaleValue[] = {{.f32 = static_cast<float>((panActionCallBack->angle))},
                                               {.f32 = static_cast<float>((panActionCallBack->angle))}};
             ArkUI_AttributeItem scaleItem = {scaleValue, sizeof(scaleValue) / sizeof(ArkUI_NumberValue)};
@@ -235,13 +232,12 @@ namespace rnoh
     void ReactBindingxArkTSMessageHandler::handleArkTSMessage(const Context &ctx)
     {
         auto rnInstance = ctx.rnInstance.lock();
-        if (!rnInstance)
+        if (!rnInstance) {
             return;
-        if (ctx.messageName == "prepare")
-        {
+        }
+        if (ctx.messageName == "prepare") {
             auto eventType = ctx.messagePayload["eventType"];
-            if (eventType == "pan")
-            {
+            if (eventType == "pan") {
                 auto maybeTag = ctx.messagePayload["anchor"];
                 auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
                 auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
@@ -250,19 +246,18 @@ namespace rnoh
                 panGestureApi = reinterpret_cast<ArkUI_NativeGestureAPI_1 *>(anyGestureApi);
                 panPanGesture =
                     panGestureApi->createPanGesture(1, GESTURE_DIRECTION_HORIZONTAL | GESTURE_DIRECTION_VERTICAL, 0);
-                auto onPanActionCallBack = [](ArkUI_GestureEvent *event, void *extraParam)
-                {
-                    if (ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan)
+                auto onPanActionCallBack = [](ArkUI_GestureEvent *event, void *extraParam) {
+                    if (ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan) {
                         return;
+                    }
                     PanActionCallBack *panActionCallBack = (PanActionCallBack *)extraParam;
                     ArkUI_GestureEventActionType actionType = OH_ArkUI_GestureEvent_GetActionType(event);
                     float x = OH_ArkUI_PanGesture_GetOffsetX(event);
                     float y = OH_ArkUI_PanGesture_GetOffsetY(event);
-                    if (actionType == GESTURE_EVENT_ACTION_UPDATE)
-                    {
+                    if (actionType == GESTURE_EVENT_ACTION_UPDATE) {
                         panActionCallBack->offsetX = panActionCallBack->positionX + x;
                         panActionCallBack->offsetY = panActionCallBack->positionY + y;
-                        std::array<ArkUI_NumberValue, 3> translateValue = {
+                        std::array<ArkUI_NumberValue, MESSAGE_HANDLER_THREE> translateValue = {
                             ArkUI_NumberValue{.f32 = panActionCallBack->offsetX * panActionCallBack->px2vp},
                             {.f32 = panActionCallBack->offsetY * panActionCallBack->px2vp},
                             {.f32 = 0}};
@@ -270,10 +265,10 @@ namespace rnoh
                         NativeNodeApi::getInstance()->setAttribute(
                             panActionCallBack->componentInstance->getLocalRootArkUINode().getArkUINodeHandle(),
                             NODE_TRANSLATE, &translateItem);
-                        panActionCallBack->rnInstance.lock()->postMessageToArkTS("touch", to_string(panActionCallBack->offsetX * panActionCallBack->px2vp) + "," + to_string(panActionCallBack->offsetY * panActionCallBack->px2vp));
-                    }
-                    else if (actionType == GESTURE_EVENT_ACTION_END)
-                    {
+                        panActionCallBack->rnInstance.lock()->postMessageToArkTS("touch", to_string(panActionCallBack->
+                            offsetX * panActionCallBack->px2vp) + "," + to_string(panActionCallBack->
+                            offsetY * panActionCallBack->px2vp));
+                    } else if (actionType == GESTURE_EVENT_ACTION_END) {
                         panActionCallBack->positionX = panActionCallBack->offsetX;
                         panActionCallBack->positionY = panActionCallBack->offsetY;
                     }
@@ -285,30 +280,21 @@ namespace rnoh
                 panGestureApi->setGestureEventTarget(
                     panPanGesture, GESTURE_EVENT_ACTION_ACCEPT | GESTURE_EVENT_ACTION_UPDATE | GESTURE_EVENT_ACTION_END,
                     panActionCallBack, onPanActionCallBack);
-                if (panGestureApi && componentInstance)
-                {
-                    panGestureApi->addGestureToNode(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(),
-                                                    panPanGesture, PARALLEL, NORMAL_GESTURE_MASK);
-                    ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan = true;
-                }
-                else if (!componentInstance)
-                {
-                    DLOG(INFO) << "ReactBindingXPackage componentInstance is null";
-                }
+                panGestureApi->addGestureToNode(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(),
+                                                panPanGesture, PARALLEL, NORMAL_GESTURE_MASK);
+                ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan = true;
             }
         }
-        if (ctx.messageName == "bind")
-        {
+        if (ctx.messageName == "bind") {
             DLOG(INFO) << "ReactBindingXPackage::messagePayload:" << ctx.messagePayload;
             auto eventType = (ctx.messagePayload["options"])["eventType"];
-            if (eventType == "orientation")
-            {
+            if (eventType == "orientation") {
                 auto maybeTag = ((ctx.messagePayload["options"])["props"])[0]["element"];
                 auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
                 auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
                 auto x = (ctx.messagePayload["data"])["x"].asDouble();
                 auto y = (ctx.messagePayload["data"])["y"].asDouble();
-                std::array<ArkUI_NumberValue, 3> translateValue = {
+                std::array<ArkUI_NumberValue, MESSAGE_HANDLER_THREE> translateValue = {
                     ArkUI_NumberValue{.f32 = static_cast<float>(x) * 100},
                     {.f32 = static_cast<float>(y) * 100},
                     {.f32 = 0}};
@@ -316,101 +302,36 @@ namespace rnoh
                 NativeNodeApi::getInstance()->setAttribute(
                     componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), NODE_TRANSLATE,
                     &translateItem);
-            }
-            else if (eventType == "pan")
-            {
-                DLOG(INFO) << "ReactBindingXPackage bind :pan:" << ctx.messagePayload;
-                auto maybeTag = (ctx.messagePayload["options"])["anchor"];
-                DLOG(INFO) << " ReactBindingXPackage pan maybeTag:" << maybeTag.asDouble();
-                auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
-                auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
-                auto anyGestureApi = OH_ArkUI_QueryModuleInterfaceByName(ARKUI_NATIVE_GESTURE, "ArkUI_NativeGestureAPI_1");
-                panGestureApi = reinterpret_cast<ArkUI_NativeGestureAPI_1 *>(anyGestureApi);
-                panPanGesture =
-                    panGestureApi->createPanGesture(1, GESTURE_DIRECTION_HORIZONTAL | GESTURE_DIRECTION_VERTICAL, 0);
-                auto onPanActionCallBack = [](ArkUI_GestureEvent *event, void *extraParam)
-                {
-                    if (ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan)
-                        return;
-                    PanActionCallBack *panActionCallBack = (PanActionCallBack *)extraParam;
-                    ArkUI_GestureEventActionType actionType = OH_ArkUI_GestureEvent_GetActionType(event);
-                    float x = OH_ArkUI_PanGesture_GetOffsetX(event);
-                    float y = OH_ArkUI_PanGesture_GetOffsetY(event);
-                    if (actionType == GESTURE_EVENT_ACTION_UPDATE)
-                    {
-                        panActionCallBack->offsetX = panActionCallBack->positionX + x;
-                        panActionCallBack->offsetY = panActionCallBack->positionY + y;
-                        std::array<ArkUI_NumberValue, 3> translateValue = {
-                            ArkUI_NumberValue{.f32 = panActionCallBack->offsetX * panActionCallBack->px2vp},
-                            {.f32 = panActionCallBack->offsetY * panActionCallBack->px2vp},
-                            {.f32 = 0}};
-                        ArkUI_AttributeItem translateItem = {translateValue.data(), translateValue.size()};
-                        NativeNodeApi::getInstance()->setAttribute(
-                            panActionCallBack->componentInstance->getLocalRootArkUINode().getArkUINodeHandle(),
-                            NODE_TRANSLATE, &translateItem);
-                        panActionCallBack->rnInstance.lock()->postMessageToArkTS(
-                            "touch", to_string(panActionCallBack->offsetX * panActionCallBack->px2vp) + "," +
-                                         to_string(panActionCallBack->offsetY * panActionCallBack->px2vp));
-                    }
-                    else if (actionType == GESTURE_EVENT_ACTION_END)
-                    {
-                        panActionCallBack->positionX = panActionCallBack->offsetX;
-                        panActionCallBack->positionY = panActionCallBack->offsetY;
-                    }
-                };
-                PanActionCallBack *panActionCallBack =
-                    new PanActionCallBack{.componentInstance = componentInstance,
-                                          .px2vp = static_cast<float>(ctx.messagePayload["px2vp"].asDouble()),
-                                          .rnInstance = rnInstance};
-                panGestureApi->setGestureEventTarget(
-                    panPanGesture, GESTURE_EVENT_ACTION_ACCEPT | GESTURE_EVENT_ACTION_UPDATE | GESTURE_EVENT_ACTION_END,
-                    panActionCallBack, onPanActionCallBack);
-                if (panGestureApi && componentInstance)
-                {
-                    panGestureApi->addGestureToNode(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(),
-                                                    panPanGesture, PARALLEL, NORMAL_GESTURE_MASK);
-                    ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan = true;
-                }
-                else if (!componentInstance)
-                {
-                    DLOG(INFO) << "ReactBindingXPackage componentInstance is null";
-                }
-
+            } else if (eventType == "pan") {
                 ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan = false;
-            }
-            else if (eventType == "scroll")
-            {
+            } else if (eventType == "scroll") {
                 auto maybeTag = (ctx.messagePayload["options"])["anchor"];
                 DLOG(INFO) << "ReactBindingXPackage::scroll maybeTag: " << maybeTag.asDouble();
                 auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
                 auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
-                auto anyGestureApi =
-                    OH_ArkUI_QueryModuleInterfaceByName(ARKUI_NATIVE_GESTURE, "ArkUI_NativeGestureAPI_1");
+                auto anyGestureApi = OH_ArkUI_QueryModuleInterfaceByName(ARKUI_NATIVE_GESTURE,
+                                                                         "ArkUI_NativeGestureAPI_1");
                 scrollGestureApi = reinterpret_cast<ArkUI_NativeGestureAPI_1 *>(anyGestureApi);
                 scrollPanGesture = scrollGestureApi->createPanGesture(1, GESTURE_DIRECTION_VERTICAL, 1);
                 folly::dynamic elementViewTag;
                 folly::dynamic elementTextTag;
                 vector<std::string> propertyAtr;
-                for (int i = 0; i < ((ctx.messagePayload["options"])["props"]).size(); i++)
-                {
+                for (int i = 0; i < ((ctx.messagePayload["options"])["props"]).size(); i++) {
                     auto element = ((ctx.messagePayload["options"])["props"])[i]["element"];
                     auto property = ((ctx.messagePayload["options"])["props"])[i]["property"];
                     propertyAtr.push_back(property.asString());
-                    if (property == "color")
-                    {
+                    if (property == "color") {
                         elementTextTag = element;
-                    }
-                    else
-                    {
+                    } else {
                         elementViewTag = element;
                     }
                 }
-                if (elementViewTag == nullptr)
+                if (elementViewTag == nullptr) {
                     return;
+                }
                 auto elementComponentInstance = rnInstanceCAPI->findComponentInstanceByTag(elementViewTag.asDouble());
                 ComponentInstance::Shared elementTextComponentInstance;
-                if (elementTextTag != nullptr)
-                {
+                if (elementTextTag != nullptr) {
                     elementTextComponentInstance =
                         rnInstanceCAPI->findComponentInstanceByTag(elementTextTag.asDouble());
                 }
@@ -429,8 +350,7 @@ namespace rnoh
                     .color =
                         (ctx.messagePayload["color"] != nullptr) ? ctx.messagePayload["color"].asString() : nullptr,
                 };
-                auto onPanActionCallBack = [](ArkUI_GestureEvent *event, void *extraParam)
-                {
+                auto onPanActionCallBack = [](ArkUI_GestureEvent *event, void *extraParam) {
                     PanActionCallBack *panActionCallBack = (PanActionCallBack *)extraParam;
                     ReactBindingxArkTSMessageHandler::getInstance()->m_panActionCallBack = panActionCallBack;
                     ReactBindingxArkTSMessageHandler::getInstance()->handleScroll();
@@ -443,9 +363,7 @@ namespace rnoh
                 scrollGestureApi->addGestureToNode(
                     componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), scrollPanGesture,
                     PARALLEL, NORMAL_GESTURE_MASK);
-            }
-            else if (eventType == "timing")
-            {
+            } else if (eventType == "timing") {
                 auto maybeTag = ((ctx.messagePayload["options"])["props"])[0]["element"];
                 auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
                 auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
@@ -453,8 +371,7 @@ namespace rnoh
                 auto y = (ctx.messagePayload["data"])["y"].asDouble();
                 DLOG(INFO) << "ReactBindingXPackage::timing x:" << x << " y:" << y;
                 vector<std::string> propertyAtr;
-                for (int i = 0; i < ((ctx.messagePayload["options"])["props"]).size(); i++)
-                {
+                for (int i = 0; i < ((ctx.messagePayload["options"])["props"]).size(); i++) {
                     auto property = ((ctx.messagePayload["options"])["props"])[i]["property"];
                     propertyAtr.push_back(property.asString());
                 }
@@ -463,9 +380,8 @@ namespace rnoh
                 translateMatchPropertys.push_back("transform.translateX");
                 translateMatchPropertys.push_back("transform.translateY");
                 vector<std::string> findTranslateAtr = findProperty(translateMatchPropertys, propertyAtr);
-                if (findTranslateAtr.size() > 0)
-                {
-                    std::array<ArkUI_NumberValue, 3> translateValue = {
+                if (findTranslateAtr.size() > 0) {
+                    std::array<ArkUI_NumberValue, MESSAGE_HANDLER_THREE> translateValue = {
                         ArkUI_NumberValue{.f32 = static_cast<float>(x)}, {.f32 = static_cast<float>(y)}, {.f32 = 0}};
                     ArkUI_AttributeItem translateItem = {translateValue.data(), translateValue.size()};
                     NativeNodeApi::getInstance()->setAttribute(
@@ -475,8 +391,7 @@ namespace rnoh
                 vector<std::string> opacityMatchPropertys;
                 opacityMatchPropertys.push_back("opacity");
                 vector<std::string> findOpacityAtr = findProperty(translateMatchPropertys, propertyAtr);
-                if (findOpacityAtr.size() > 0)
-                {
+                if (findOpacityAtr.size() > 0) {
                     ArkUI_NumberValue opacityValue[] = {
                         {.f32 = static_cast<float>(ctx.messagePayload["opacity"].asDouble())}};
                     ArkUI_AttributeItem opacityItem = {opacityValue, sizeof(opacityValue) / sizeof(ArkUI_NumberValue)};
@@ -485,68 +400,58 @@ namespace rnoh
                         &opacityItem);
                 }
             }
-        }
-        else if (ctx.messageName == "unbind")
-        {
-
+        } else if (ctx.messageName == "unbind") {
             auto eventType = (ctx.messagePayload["options"])["eventType"];
-            if (eventType == "pan")
-            {
+            if (eventType == "pan") {
                 auto maybeTag = (ctx.messagePayload["options"])["token"];
                 auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
                 auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
-                if (panGestureApi && componentInstance)
-                {
+                if (panGestureApi && componentInstance) {
                     panGestureApi->removeGestureFromNode(
                         componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), panPanGesture);
                 }
                 ReactBindingxArkTSMessageHandler::getInstance()->isInterceptPan = false;
-            }
-            else if (eventType == "scroll")
-            {
+            } else if (eventType == "scroll") {
                 DLOG(INFO) << "ReactBindingXPackage::scroll unbind";
                 auto maybeTag = (ctx.messagePayload["options"])["token"];
                 DLOG(INFO) << "ReactBindingXPackage::event scroll unbind " << maybeTag.asDouble();
                 auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
                 auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag.asDouble());
-                if (scrollGestureApi && componentInstance)
-                {
+                if (scrollGestureApi && componentInstance) {
                     scrollGestureApi->removeGestureFromNode(
                         componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), scrollPanGesture);
                 }
             }
-        }
-        else if (ctx.messageName == "eval")
-        {
-
+        } else if (ctx.messageName == "eval") {
             auto msg = ctx.messagePayload["data"];
             ExpressHandleEval::getInstance()->init_mapping(ExpressHandleEval::getInstance()->op_mapping);
             double result = ExpressHandleEval::getInstance()->eval(msg.asString());
             std::ostringstream sstream;
             sstream << result;
             std::string eventType = ctx.messagePayload["eventType"].asString();
-            if (eventType == "scroll")
-            {
+            if (eventType == "scroll") {
                 scrollEvalValue = result;
             }
-            if (eventType == "timing")
-            {
+            if (eventType == "timing") {
                 rnInstance->postMessageToArkTS("eval", result);
             }
-        }
-        else if (ctx.messageName == "getComputedStyle")
-        {
+        }  else if (ctx.messageName == "getComputedStyle") {
             auto maybeTag = (ctx.messagePayload["element"]).asDouble();
             auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
             auto componentInstance = rnInstanceCAPI->findComponentInstanceByTag(maybeTag);
-            float translate = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), NODE_TRANSLATE)->value[0].f32;
-            float scale = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), NODE_SCALE)->value[0].f32;
-            float roate = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), NODE_ROTATE)->value[3].f32;
-            float opacity = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), NODE_OPACITY)->value[0].f32;
-            float backgroundColor = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().getArkUINodeHandle(), NODE_BACKGROUND_COLOR)->value[0].u32;
+            float translate = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().
+                getArkUINodeHandle(), NODE_TRANSLATE)->value[0].f32;
+            float scale = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().
+                getArkUINodeHandle(), NODE_SCALE)->value[0].f32;
+            float roate = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().
+                getArkUINodeHandle(), NODE_ROTATE)->value[MESSAGE_HANDLER_THREE].f32;
+            float opacity = NativeNodeApi::getInstance()->getAttribute(componentInstance->getLocalRootArkUINode().
+                getArkUINodeHandle(), NODE_OPACITY)->value[0].f32;
+            float backgroundColor = NativeNodeApi::getInstance()->getAttribute(componentInstance->
+                getLocalRootArkUINode().getArkUINodeHandle(), NODE_BACKGROUND_COLOR)->value[0].u32;
             std::string computedStyle = "{translate:" + to_string(translate) + ",scale:" + to_string(scale) +
                                         ",roate:" + to_string(roate) + ",opacity:" + to_string(opacity) +
-                                        ",background-color:" + to_string(backgroundColor) + "}";
+                                        ",background-color:" + to_string(backgroundColor) +"}";
             DLOG(INFO) << "ReactBindingXPackage::getComputedStyle post:" << computedStyle;
             rnInstance->postMessageToArkTS("style", computedStyle);
         }
@@ -554,8 +459,7 @@ namespace rnoh
 
     ReactBindingxArkTSMessageHandler *ReactBindingxArkTSMessageHandler::getInstance()
     {
-        if (!m_reactBindingxArkTSMessageHandler)
-        {
+        if (!m_reactBindingxArkTSMessageHandler) {
             m_reactBindingxArkTSMessageHandler = new ReactBindingxArkTSMessageHandler();
         }
         return m_reactBindingxArkTSMessageHandler;

package/harmony/bindingx/src/main/cpp/ReactBindingxArkTSMessageHandler.h

@@ -68,7 +68,7 @@ namespace rnoh {
         static ReactBindingxArkTSMessageHandler *getInstance();
         float m_scrollY;
         std::map<std::string, std::string> styleMap;
-        bool isInterceptPan = true; 
+        bool isInterceptPan = true;
     public:
         void handleArkTSMessage(const Context &ctx) override;
 

package/harmony/bindingx/src/main/ets/{ReactBindingXPackage.ts → ReactBindingXPackage.ets}

@@ -22,9 +22,10 @@
  * SOFTWARE.
  */
 
-import {RNPackage, TurboModuleContext, TurboModulesFactory} from '@rnoh/react-native-openharmony/ts';
-import type {TurboModule} from '@rnoh/react-native-openharmony/ts';
-import {ReactBindingXModule} from './ReactBindingXModule';
+import { RNPackage, TurboModuleContext, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+import { RNOHPackage } from '@rnoh/react-native-openharmony'
+import type { TurboModule } from '@rnoh/react-native-openharmony/ts';
+import { ReactBindingXModule } from './ReactBindingXModule';
 
 class ReactBindingXTurboModulesFactory extends TurboModulesFactory {
   createTurboModule(name: string): TurboModule | null {
@@ -39,7 +40,7 @@ class ReactBindingXTurboModulesFactory extends TurboModulesFactory {
   }
 }
 
-export class ReactBindingXPackage extends RNPackage {
+export class ReactBindingXPackage extends RNOHPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new ReactBindingXTurboModulesFactory(ctx);
   }

package/harmony/bindingx/{ts.ts → ts.ets}

@@ -22,5 +22,5 @@
  * SOFTWARE.
  */
 
-export * from "./src/main/ets/ReactBindingXPackage"
+export * from "./src/main/ets/ReactBindingXPackage.ets"
 export * from "./src/main/ets/ReactBindingXModule"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-bindingx",
-  "version": "1.0.4-rc.1",
+  "version": "1.0.4-rc.2",
   "scripts": {
     "prepublish": "",
     "test": "jest"
@@ -8,7 +8,13 @@
   "main": "lib/index.js",
   "nativePackage": true,
   "harmony": {
-    "alias":"react-native-bindingx"
+    "alias": "react-native-bindingx",
+    "autolinking": {
+      "etsPackageClassName": "ReactBindingXPackage",
+      "cppPackageClassName": "ReactBindingXPackage",
+      "cmakeLibraryTargetName": "rnoh_bindingx",
+      "ohPackageName": "@react-native-ohos/react-native-bindingx"
+    }
   },
   "dependencies": {
     "bindingx-parser": "^0.0.2"
@@ -22,6 +28,6 @@
   ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-     "access": "public"
+    "access": "public"
   }
 }