refactor:适配3.0.2版本 (#21)

Signed-off-by: wupingyuan <wupingyuan2@h-partners.com>

Author: yuangerep

harmony/spring_scrollview/src/main/cpp/EventEmitters.cpp

@@ -107,5 +107,52 @@ void RNCSpringScrollViewEventEmitter::onScrollBeginDrag() const {
     });
 }
 
+
+void RNCSpringScrollViewEventEmitter::onCustomScrollBeginDrag() const {
+    dispatchEvent("customScrollBeginDrag", [](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        return payload;
+    });
+}
+
+void RNCSpringScrollViewEventEmitter::onCustomScrollEndDrag() const {
+    dispatchEvent("customScrollEndDrag", [](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        return payload;
+    });
+}
+
+
+void RNCSpringScrollViewEventEmitter::onCustomTouchBegin() const {
+    dispatchEvent("customTouchBegin", [](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        return payload;
+    });
+}
+
+
+void RNCSpringScrollViewEventEmitter::onCustomTouchEnd() const {
+    dispatchEvent("customTouchEnd", [](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        return payload;
+    });
+}
+
+
+void RNCSpringScrollViewEventEmitter::onCustomMomentumScrollBegin() const {
+    dispatchEvent("customMomentumScrollBegin", [](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        return payload;
+    });
+}
+
+
+void RNCSpringScrollViewEventEmitter::onCustomMomentumScrollEnd() const {
+    dispatchEvent("customMomentumScrollEnd", [](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        return payload;
+    });
+}
+
 } // namespace react
 } // namespace facebook

harmony/spring_scrollview/src/main/cpp/EventEmitters.h

@@ -67,6 +67,12 @@ class JSI_EXPORT RNCSpringScrollViewEventEmitter : public ViewEventEmitter {
     void onSizeChange(OnSizeChange value) const;
     void onContentSizeChange(OnContentSizeChange value) const;
     void onScrollBeginDrag() const;
+    void onCustomScrollBeginDrag() const;
+    void onCustomScrollEndDrag() const;
+    void onCustomTouchBegin() const;
+    void onCustomTouchEnd() const;
+    void onCustomMomentumScrollBegin() const;
+    void onCustomMomentumScrollEnd() const;
 };
 } // namespace react
 } // namespace facebook

harmony/spring_scrollview/src/main/cpp/Props.cpp

@@ -34,7 +34,7 @@ RNCSpringScrollViewProps::RNCSpringScrollViewProps(const PropsParserContext &con
                                                    const RNCSpringScrollViewProps &sourceProps,
                                                    const RawProps &rawProps)
     : ViewProps(context, sourceProps, rawProps),
-      initialContentOffset(convertRawProp(context, rawProps, "initialContentOffset", sourceProps.initialContentOffset,
+           initialContentOffset(convertRawProp(context, rawProps, "initialContentOffset", sourceProps.initialContentOffset,
                                           Types::Offset(0.0f, 0.0f))),
       refreshHeaderHeight(
           convertRawProp(context, rawProps, "refreshHeaderHeight", sourceProps.refreshHeaderHeight, 1.0f)),
@@ -45,7 +45,11 @@ RNCSpringScrollViewProps::RNCSpringScrollViewProps(const PropsParserContext &con
       inverted(convertRawProp(context, rawProps, "inverted", sourceProps.inverted, false)),
       allLoaded(convertRawProp(context, rawProps, "allLoaded", sourceProps.allLoaded, false)),
       directionalLockEnabled(
-          convertRawProp(context, rawProps, "directionalLockEnabled", sourceProps.directionalLockEnabled, false)) {}
+          convertRawProp(context, rawProps, "directionalLockEnabled", sourceProps.directionalLockEnabled, false)),
+      pagingEnabled(convertRawProp(context, rawProps, "pagingEnabled", sourceProps.pagingEnabled, false)),
+      pageSize(convertRawProp(context, rawProps, "pageSize", sourceProps.pageSize, Types::Size(0.0f, 0.0f))),
+      decelerationRate(
+                  convertRawProp(context, rawProps, "decelerationRate", sourceProps.decelerationRate, 1.0f)){}
 
 void fromRawValue(const PropsParserContext &context, const RawValue &value, Types::Offset &result) {
     auto map = (butter::map<std::string, RawValue>)value;

harmony/spring_scrollview/src/main/cpp/Props.h

@@ -45,14 +45,17 @@ class JSI_EXPORT RNCSpringScrollViewProps final : public ViewProps {
     void fromRawValue(const PropsParserContext &context, const RawValue &value, Types::EdgeInsets &result);
 
 #pragma mark - Props
-    Types::Offset initialContentOffset;
+        Types::Offset initialContentOffset;
     float refreshHeaderHeight;
     float loadingFooterHeight;
     bool bounces;
     bool scrollEnabled;
     bool inverted;
     bool allLoaded;
     bool directionalLockEnabled;
+    bool pagingEnabled;
+    float decelerationRate;
+    Types::Size pageSize;
 };
 } // namespace react
 } // namespace facebook

harmony/spring_scrollview/src/main/cpp/SpringScrollViewArkTsMessageHandler.cpp

@@ -41,6 +41,7 @@ void SpringScrollViewArkTSMessageHandler::handleArkTSMessage(const Context &ctx)
         auto event = std::make_shared<SpringScrollViewEvent>(5);
         event->setAnimationValue(ctx.messagePayload["value"].asDouble());
         event->setEventType(ctx.messagePayload["type"].asString());
+        event->setEventDirections(ctx.messagePayload["directions"].asBool());
         event->setMessageType("onUpdate");
         auto baseEvent = std::static_pointer_cast<EventBus::Event>(event);
         EventBus::EventBus::getInstance()->fire(baseEvent);
@@ -49,6 +50,8 @@ void SpringScrollViewArkTSMessageHandler::handleArkTSMessage(const Context &ctx)
     if (ctx.messageName == "onEnd") {
         auto event = std::make_shared<SpringScrollViewEvent>(5);
         event->setEventType(ctx.messagePayload["type"].asString());
+        event->setEventDirections(ctx.messagePayload["directions"].asBool());
+        event->setAnimationValue(ctx.messagePayload["value"].asDouble());
         event->setMessageType("onEnd");
         auto baseEvent = std::static_pointer_cast<EventBus::Event>(event);
         EventBus::EventBus::getInstance()->fire(baseEvent);