feat(ohos): adapt list for desktop device

Author: etkmao

framework/ohos/src/main/cpp/impl/connector/src/setting_napi.cc

@@ -26,6 +26,7 @@
 #include "oh_napi/ark_ts.h"
 #include "footstone/check.h"
 #include "footstone/logging.h"
+#include "renderer/utils/hr_device_utils.h"
 #include "renderer/utils/hr_pixel_utils.h"
 
 namespace hippy {
@@ -83,11 +84,18 @@ static napi_value SetFontWeightScale(napi_env env, napi_callback_info info) {
   return arkTs.GetUndefined();
 }
 
+static napi_value SetDesktop(napi_env env, napi_callback_info info) {
+  HRDeviceUtils::SetDesktop();
+  ArkTS arkTs(env);
+  return arkTs.GetUndefined();
+}
+
 REGISTER_OH_NAPI("Setting", "Setting_SetFlags", SetFlags)
 REGISTER_OH_NAPI("Setting", "Setting_SetDensity", SetDensity)
 REGISTER_OH_NAPI("Setting", "Setting_SetDensityScale", SetDensityScale)
 REGISTER_OH_NAPI("Setting", "Setting_SetFontSizeScale", SetFontSizeScale)
 REGISTER_OH_NAPI("Setting", "Setting_SetFontWeightScale", SetFontWeightScale)
+REGISTER_OH_NAPI("Setting", "Setting_SetDesktop", SetDesktop)
 
 }
 }

framework/ohos/src/main/cpp/impl/renderer/native/CMakeLists.txt

@@ -78,6 +78,7 @@ set(SOURCE_SET
   src/uimanager/hr_keyboard_manager.cc
   src/utils/hr_event_utils.cc
   src/utils/hr_convert_utils.cc
+  src/utils/hr_device_utils.cc
   src/utils/hr_pixel_utils.cc
   src/utils/hr_text_convert_utils.cc
   src/utils/hr_url_utils.cc

framework/ohos/src/main/cpp/impl/renderer/native/include/renderer/utils/hr_device_utils.h

@@ -0,0 +1,45 @@
+/*
+ *
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#pragma once
+
+namespace hippy {
+inline namespace render {
+inline namespace native {
+
+class HRDeviceUtils {
+public:
+  inline static void SetDesktop() {
+    isDesktop_ = true;
+  }
+
+  inline static bool IsDesktop() {
+    return isDesktop_;
+  }
+
+private:
+  static bool isDesktop_;
+};
+
+} // namespace native
+} // namespace render
+} // namespace hippy

framework/ohos/src/main/cpp/impl/renderer/native/src/components/list_view.cc

@@ -25,6 +25,7 @@
 #include "renderer/components/refresh_wrapper_view.h"
 #include "renderer/dom_node/hr_node_props.h"
 #include "renderer/utils/hr_convert_utils.h"
+#include "renderer/utils/hr_device_utils.h"
 #include "renderer/utils/hr_event_utils.h"
 #include "renderer/utils/hr_pixel_utils.h"
 #include "renderer/utils/hr_value_utils.h"
@@ -333,6 +334,19 @@ void ListView::OnScrollStop() {
   if (onScrollEventEnable_) {
     EmitScrollEvent(HREventUtils::EVENT_SCROLLER_ON_SCROLL);
   }
+
+  if (HRDeviceUtils::IsDesktop()) {
+    if (footerView_ && pullAction_ == ScrollAction::PullFooter) {
+      if (footerViewFullVisible_) {
+        HREventUtils::SendComponentEvent(footerView_->GetCtx(), footerView_->GetTag(),
+                                         HREventUtils::EVENT_PULL_FOOTER_RELEASED, nullptr);
+      } else {
+        auto lastIndex = static_cast<int32_t>(children_.size()) - 1;
+        listNode_->ScrollToIndex(lastIndex - 1 - (hasPullHeader_? 1 : 0), true, ARKUI_SCROLL_ALIGNMENT_END);
+      }
+      pullAction_ = ScrollAction::None;
+    }
+  }
 }
 
 void ListView::OnReachStart() {
@@ -346,11 +360,13 @@ void ListView::OnReachEnd() {
 
 void ListView::OnTouch(int32_t actionType, const HRPosition &screenPosition) {
   BaseView::OnTouch(actionType, screenPosition);
-  
-  if (actionType == UI_TOUCH_EVENT_ACTION_DOWN || actionType == UI_TOUCH_EVENT_ACTION_MOVE) {
-    CheckBeginDrag();
-  } else if (actionType == UI_TOUCH_EVENT_ACTION_UP || actionType == UI_TOUCH_EVENT_ACTION_CANCEL) {
-    CheckEndDrag();
+
+  if (!HRDeviceUtils::IsDesktop()) {
+    if (actionType == UI_TOUCH_EVENT_ACTION_DOWN || actionType == UI_TOUCH_EVENT_ACTION_MOVE) {
+      CheckBeginDrag();
+    } else if (actionType == UI_TOUCH_EVENT_ACTION_UP || actionType == UI_TOUCH_EVENT_ACTION_CANCEL) {
+      CheckEndDrag();
+    }
   }
 }
 
@@ -614,15 +630,24 @@ void ListView::CheckPullOnItemVisibleAreaChange(int32_t index, bool isVisible, f
   auto lastIndex = static_cast<int32_t>(children_.size()) - 1;
   if (footerView_ && index == lastIndex) {
     if (isVisible) {
-      if (isDragging_) {
+      if (HRDeviceUtils::IsDesktop()) {
         pullAction_ = ScrollAction::PullFooter;
         if (currentRatio >= 1.0) {
           footerViewFullVisible_ = true;
         } else {
           footerViewFullVisible_ = false;
         }
       } else {
-        listNode_->ScrollToIndex(lastIndex - 1 - (hasPullHeader_? 1 : 0), true, ARKUI_SCROLL_ALIGNMENT_END);
+        if (isDragging_) {
+          pullAction_ = ScrollAction::PullFooter;
+          if (currentRatio >= 1.0) {
+            footerViewFullVisible_ = true;
+          } else {
+            footerViewFullVisible_ = false;
+          }
+        } else {
+          listNode_->ScrollToIndex(lastIndex - 1 - (hasPullHeader_? 1 : 0), true, ARKUI_SCROLL_ALIGNMENT_END);
+        }
       }
     } else {
       footerViewFullVisible_ = false;

framework/ohos/src/main/cpp/impl/renderer/native/src/utils/hr_device_utils.cc

@@ -0,0 +1,33 @@
+/*
+ *
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "renderer/utils/hr_device_utils.h"
+
+namespace hippy {
+inline namespace render {
+inline namespace native {
+
+bool HRDeviceUtils::isDesktop_ = false;
+
+} // namespace native
+} // namespace render
+} // namespace hippy

framework/ohos/src/main/ets/hippy_framework/HippyEngine.ets

@@ -17,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import deviceInfo from '@ohos.deviceInfo';
 import { HippyLibrary } from '../hippy_library/HippyLibrary';
 import { PixelUtil } from "../support/utils/PixelUtil";
 import { NativeRenderContext } from '../renderer_native/NativeRenderContext';
@@ -97,6 +98,12 @@ export function createHippyEngine(params: EngineInitParams): HippyEngine {
   PixelUtil.doInitDensity()
   LogUtils.enableDebugLog(params.enableLog)
   params.libHippy?.Setting_SetFlags(params.enableUpdateAnimLog);
+
+  let deviceType: string = deviceInfo.deviceType;
+  if (deviceType === "2in1") {
+    params.libHippy?.Setting_SetDesktop();
+  }
+
   return new HippyEngineManagerImpl(params)
 }
 

framework/ohos/src/main/ets/hippy_library/HippyLibrary.ets

@@ -143,6 +143,7 @@ export interface HippyLibrary {
   Setting_SetDensityScale(densityScale: number): void;
   Setting_SetFontSizeScale(fontSizeScale: number): void;
   Setting_SetFontWeightScale(fontWeightScale: number): void;
+  Setting_SetDesktop(): void;
 
   // main线程使用
   WorkerManager_InitWModuleManager(notifyMainThreadFunction: (