From a9e71e277e3922d7c809d87ea84cf7fec5d1e59c Mon Sep 17 00:00:00 2001
From: wangyu <wangyu@batiao8.com>
Date: Thu, 19 Mar 2026 15:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86ui=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragment/mine/about/AboutFragment.kt   | 34 +++++++++++++++++--
 .../main/res/layout/fragment_guide_item2.xml  |  2 +-
 .../main/res/layout/fragment_guide_item3.xml  |  2 +-
 .../main/res/layout/fragment_guide_item4.xml  |  2 +-
 .../main/res/layout/fragment_guide_item5.xml  |  2 +-
 app/src/main/res/layout/listitem_order.xml    |  5 ++-
 app/src/main/res/layout/pop_about_tip.xml     |  4 +--
 7 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/about/AboutFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/about/AboutFragment.kt
index 90cae56..287bedd 100644
--- a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/about/AboutFragment.kt
+++ b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/about/AboutFragment.kt
@@ -1,15 +1,21 @@
 package com.cheng.blzb.ui.fragment.mine.about
 
 import android.annotation.SuppressLint
+import android.view.MotionEvent
 import com.cheng.blzb.databinding.FragmentAboutBinding
 import com.cheng.blzb.ui.dialog.PopupDialog
 import com.cheng.blzb.utils.UrlHelper
+import com.example.base.common.RxCountDown
 import com.example.base.extensions.onClick
 import com.example.base.ui.BaseFragment
 import com.example.base.utils.AppUtils
+import io.reactivex.rxjava3.disposables.Disposable
 import org.jetbrains.anko.sdk27.listeners.onLongClick
+import org.jetbrains.anko.sdk27.listeners.onTouch
 
 class AboutFragment : BaseFragment<FragmentAboutBinding, AboutViewModel>() {
+    private var countdownTask: Disposable? = null
+
     @SuppressLint("SetTextI18n")
     override fun initView() {
         super.initView()
@@ -20,9 +26,17 @@ class AboutFragment : BaseFragment<FragmentAboutBinding, AboutViewModel>() {
 
     override fun initListener() {
         super.initListener()
-        binding.ivIco.onLongClick {
-            PopupDialog.showAboutTip(requireContext(),binding.ivIco)
-            false
+        binding.ivIco.onTouch { v, event ->
+            when(event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    startCountdown()
+                }
+
+                MotionEvent.ACTION_UP -> {
+                    stopCountdown()
+                }
+            }
+            true
         }
         binding.tvAgreement.onClick {
             UrlHelper.startUserAgreement(requireContext())
@@ -40,4 +54,18 @@ class AboutFragment : BaseFragment<FragmentAboutBinding, AboutViewModel>() {
             UrlHelper.startSDKList(requireContext())
         }
     }
+
+    private fun startCountdown() {
+        stopCountdown()
+        countdownTask = RxCountDown.countdown(3).subscribe {
+            if (it == 0L) {
+                PopupDialog.showAboutTip(requireContext(),binding.ivIco)
+            }
+        }
+    }
+
+    private fun stopCountdown() {
+        countdownTask?.dispose()
+        countdownTask = null
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_guide_item2.xml b/app/src/main/res/layout/fragment_guide_item2.xml
index b83e441..15fe310 100644
--- a/app/src/main/res/layout/fragment_guide_item2.xml
+++ b/app/src/main/res/layout/fragment_guide_item2.xml
@@ -16,7 +16,7 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginTop="@dimen/dp_14"
             android:src="@mipmap/ic_guide_item_title_bg"
             app:layout_constraintEnd_toEndOf="@id/tv_title"
             app:layout_constraintStart_toStartOf="@id/tv_title"
diff --git a/app/src/main/res/layout/fragment_guide_item3.xml b/app/src/main/res/layout/fragment_guide_item3.xml
index bb282e8..91d6df4 100644
--- a/app/src/main/res/layout/fragment_guide_item3.xml
+++ b/app/src/main/res/layout/fragment_guide_item3.xml
@@ -18,7 +18,7 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginTop="@dimen/dp_14"
             android:src="@mipmap/ic_guide_item_title_bg"
             app:layout_constraintEnd_toEndOf="@id/tv_title"
             app:layout_constraintStart_toStartOf="@id/tv_title"
diff --git a/app/src/main/res/layout/fragment_guide_item4.xml b/app/src/main/res/layout/fragment_guide_item4.xml
index 227ca2b..055752f 100644
--- a/app/src/main/res/layout/fragment_guide_item4.xml
+++ b/app/src/main/res/layout/fragment_guide_item4.xml
@@ -22,7 +22,7 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_25"
+                android:layout_marginTop="@dimen/dp_14"
                 android:src="@mipmap/ic_guide_item_title_bg"
                 app:layout_constraintEnd_toEndOf="@id/tv_title"
                 app:layout_constraintStart_toStartOf="@id/tv_title"
diff --git a/app/src/main/res/layout/fragment_guide_item5.xml b/app/src/main/res/layout/fragment_guide_item5.xml
index 5fc24e8..b192d7b 100644
--- a/app/src/main/res/layout/fragment_guide_item5.xml
+++ b/app/src/main/res/layout/fragment_guide_item5.xml
@@ -65,7 +65,7 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginTop="@dimen/dp_14"
             android:src="@mipmap/ic_guide_item_title_bg"
             app:layout_constraintEnd_toEndOf="@id/tv_title"
             app:layout_constraintStart_toStartOf="@id/tv_title"
diff --git a/app/src/main/res/layout/listitem_order.xml b/app/src/main/res/layout/listitem_order.xml
index a48ba1a..8150a2a 100644
--- a/app/src/main/res/layout/listitem_order.xml
+++ b/app/src/main/res/layout/listitem_order.xml
@@ -12,7 +12,9 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/dp_12">
+        android:paddingStart="@dimen/dp_12"
+        android:paddingEnd="@dimen/dp_12"
+        android:paddingBottom="@dimen/dp_12">
 
         <TextView
             android:id="@+id/tv_name"
@@ -21,6 +23,7 @@
             android:text="一元试用"
             android:textColor="@color/color_1a1a1a"
             android:textSize="@dimen/sp_15"
+            android:layout_marginTop="@dimen/dp_12"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/pop_about_tip.xml b/app/src/main/res/layout/pop_about_tip.xml
index 270ee1f..da742d8 100644
--- a/app/src/main/res/layout/pop_about_tip.xml
+++ b/app/src/main/res/layout/pop_about_tip.xml
@@ -23,7 +23,7 @@
             android:paddingBottom="@dimen/dp_10"
             android:text="查看配置"
             android:textSize="@dimen/sp_14"
-            android:textColor="@color/color_1a1a1a"
+            android:textColor="@color/color_90ffffff"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <View
@@ -43,7 +43,7 @@
             android:paddingBottom="@dimen/dp_10"
             android:text="查看引导页"
             android:textSize="@dimen/sp_14"
-            android:textColor="@color/color_1a1a1a"
+            android:textColor="@color/color_90ffffff"
             app:layout_constraintTop_toBottomOf="@+id/tvTip1" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>