取消滑动拉升效果

tencentyun · Sep 25, 2024 · 8d3a3f7 · 8d3a3f7
1 parent 97437a9
commit 8d3a3f7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/.../main/java/com/tencent/iot/explorer/link/kitlink/fragment/SecondDeviceCategoryFragment.kt b/.../main/java/com/tencent/iot/explorer/link/kitlink/fragment/SecondDeviceCategoryFragment.kt
@@ -9,6 +9,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -112,7 +113,7 @@ class SecondDeviceCategoryFragment() : BaseFragment(), MyCallback {
         HttpRequest.instance.getSecondLevelCategoryList(categoryKey, this)
     }
 
-    var bleToGoView = object : BleToGoView {
+    private val bleToGoView = object : BleToGoView {
         override fun onGoH5Ble(productId: String) {
             var bundle = Bundle()
             bundle.putString(CommonField.EXTRA_INFO, productId)
@@ -238,11 +239,17 @@ class SecondDeviceCategoryFragment() : BaseFragment(), MyCallback {
             llTitleLp.rightMargin = Utils.dp2px(requireContext(), 10)
             mLlTitleMap[it.SubCategoryKey] = llTitle
             second_category_container.addView(llTitle, llTitleLp)
-            val deviceGridView = RecyclerView(requireContext())
+            val deviceGridView = object : RecyclerView(requireContext()) {
+                override fun onTouchEvent(e: MotionEvent?) = false
+            }
+            deviceGridView.overScrollMode = View.OVER_SCROLL_NEVER
             deviceGridView.tag = "${it.SubCategoryKey}_gridview_tag"
             val gridAdapter = GridAdapter(onItemClickListener)
             deviceGridView.adapter = gridAdapter
-            deviceGridView.layoutManager = GridLayoutManager(requireContext(), 3)
+            deviceGridView.layoutManager = object : GridLayoutManager(requireContext(), 3) {
+                override fun canScrollHorizontally() = false
+                override fun canScrollVertically() = false
+            }
             deviceGridView.isVisible = false
             mGridAdapterMap[it.SubCategoryKey] = deviceGridView
             second_category_container.addView(deviceGridView)
@@ -331,7 +338,11 @@ class SecondDeviceCategoryFragment() : BaseFragment(), MyCallback {
 
     private val onItemClickListener = object : OnItemClickListener<CategoryDeviceInfo> {
         override fun onItemClick(position: Int, data: CategoryDeviceInfo) {
-            if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            if (ContextCompat.checkSelfPermission(
+                    requireContext(),
+                    Manifest.permission.ACCESS_FINE_LOCATION
+                ) != PackageManager.PERMISSION_GRANTED
+            ) {
                 clickDeviceInfo = data
                 // 查看请求location权限的时间是否大于48小时
                 var locationJsonString = Utils.getStringValueFromXml(
@@ -365,7 +376,7 @@ class SecondDeviceCategoryFragment() : BaseFragment(), MyCallback {
                 )
 
             } else {
-                if (data.IsRelatedProduct){// 根据推荐设备的配网方式，跳转到SmartConfig或者SoftAp配网界面
+                if (data.IsRelatedProduct) {// 根据推荐设备的配网方式，跳转到SmartConfig或者SoftAp配网界面
                     if (goBleH5Presenter != null) {
                         conditionPrefix = false
                         goBleH5Presenter!!.checkProductConfig(data.ProductId)
@@ -374,7 +385,7 @@ class SecondDeviceCategoryFragment() : BaseFragment(), MyCallback {
                             listOf(data.ProductId), this@SecondDeviceCategoryFragment
                         )
                     }
-                }else{
+                } else {
                     startActivityWithExtra(SmartConfigStepActivity::class.java, "")
                 }
             }

diff --git a/app/src/main/res/layout/new_fragment_devices.xml b/app/src/main/res/layout/new_fragment_devices.xml
@@ -23,8 +23,8 @@
                 android:id="@+id/ll_recommend_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="13dp"
                 android:layout_marginHorizontal="10dp"
+                android:layout_marginTop="13dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -55,6 +55,7 @@
                 android:id="@+id/rv_recommend_devices"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:overScrollMode="never"
                 android:tag="recommend_gridview_tag"
                 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                 app:spanCount="3" />