From 1cfcb3fe977610c41dafdbd61aed55c7b9feea8d Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Tue, 16 Dec 2025 10:10:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E5=87=BA=E6=B8=AF=E8=AE=A1?=
 =?UTF-8?q?=E9=87=8D=20=E5=BC=80=E5=A7=8B=E8=AE=A1=E9=87=8D=20floatButton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gjc/activity/GjcWeighingStartActivity.kt  | 154 ++++++++++++++++++
 .../src/main/res/drawable/bg_float_button.xml |   5 +
 .../ic_float_button_weighing_start.png        | Bin 0 -> 1813 bytes
 .../layout/activity_gjc_weighing_start.xml    |  64 +++++++-
 4 files changed, 214 insertions(+), 9 deletions(-)
 create mode 100644 module_gjc/src/main/res/drawable/bg_float_button.xml
 create mode 100644 module_gjc/src/main/res/drawable/ic_float_button_weighing_start.png

diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingStartActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingStartActivity.kt
index 3b8b5cf..3d8e320 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingStartActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcWeighingStartActivity.kt
@@ -1,8 +1,13 @@
 package com.lukouguoji.gjc.activity
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.lukouguoji.gjc.R
 import com.lukouguoji.gjc.databinding.ActivityGjcWeighingStartBinding
@@ -18,6 +23,8 @@ import com.lukouguoji.module_base.router.ARouterConstants
 class GjcWeighingStartActivity :
     BaseBindingActivity<ActivityGjcWeighingStartBinding, GjcWeighingStartViewModel>() {
 
+    private var isExpanded = false
+
     override fun layoutId() = R.layout.activity_gjc_weighing_start
 
     override fun viewModelClass() = GjcWeighingStartViewModel::class.java
@@ -26,6 +33,153 @@ class GjcWeighingStartActivity :
         setBackArrow("开始计重")
         binding.viewModel = viewModel
         viewModel.initOnCreated(this, intent)
+
+        setupFloatButtons()
+    }
+
+    private fun setupFloatButtons() {
+        // 主按钮点击事件
+        binding.mainFloatButton.setOnClickListener {
+            if (!isExpanded) {
+                expandButtons()
+            }
+        }
+
+        // 遮罩层点击事件
+        binding.maskView.setOnClickListener {
+            collapseButtons()
+        }
+
+        // 子按钮1点击事件 - 跳转到出港运抵页面
+        binding.subButton1.setOnClickListener {
+            com.alibaba.android.arouter.launcher.ARouter.getInstance()
+                .build(ARouterConstants.ACTIVITY_URL_INT_EXP_ARRIVE)
+                .navigation()
+            collapseButtons()
+        }
+
+        // 子按钮2点击事件 - 跳转到计重记录
+        binding.subButton2.setOnClickListener {
+            com.alibaba.android.arouter.launcher.ARouter.getInstance()
+                .build(ARouterConstants.ACTIVITY_URL_GJC_WEIGHING_RECORD_LIST)
+                .navigation()
+            collapseButtons()
+        }
+    }
+
+    /**
+     * 展开子按钮
+     */
+    private fun expandButtons() {
+        isExpanded = true
+
+        // 显示遮罩层
+        binding.maskView.visibility = View.VISIBLE
+        binding.maskView.alpha = 0f
+        binding.maskView.animate().alpha(0.3f).setDuration(200).start()
+
+        // 显示子按钮
+        binding.subButton1.visibility = View.VISIBLE
+        binding.subButton2.visibility = View.VISIBLE
+
+        // 子按钮1动画（向左上方移动: 左移15dp, 上移55dp）
+        val sub1TransX = ObjectAnimator.ofFloat(binding.subButton1, "translationX", 0f, -5f)
+        val sub1TransY = ObjectAnimator.ofFloat(binding.subButton1, "translationY", 0f, -25f)
+        val sub1Alpha = ObjectAnimator.ofFloat(binding.subButton1, "alpha", 0f, 1f)
+        val sub1Scale = ObjectAnimator.ofFloat(binding.subButton1, "scaleX", 0f, 1f)
+        val sub1ScaleY = ObjectAnimator.ofFloat(binding.subButton1, "scaleY", 0f, 1f)
+
+        val animSet1 = AnimatorSet()
+        animSet1.playTogether(sub1TransX, sub1TransY, sub1Alpha, sub1Scale, sub1ScaleY)
+        animSet1.duration = 200
+
+        // 子按钮2动画（向左下方移动: 左移55dp, 下移15dp）
+        val sub2TransX = ObjectAnimator.ofFloat(binding.subButton2, "translationX", 0f, -25f)
+        val sub2TransY = ObjectAnimator.ofFloat(binding.subButton2, "translationY", 0f, -5f)
+        val sub2Alpha = ObjectAnimator.ofFloat(binding.subButton2, "alpha", 0f, 1f)
+        val sub2Scale = ObjectAnimator.ofFloat(binding.subButton2, "scaleX", 0f, 1f)
+        val sub2ScaleY = ObjectAnimator.ofFloat(binding.subButton2, "scaleY", 0f, 1f)
+
+        val animSet2 = AnimatorSet()
+        animSet2.playTogether(sub2TransX, sub2TransY, sub2Alpha, sub2Scale, sub2ScaleY)
+        animSet2.duration = 200
+        animSet2.startDelay = 50
+
+        // 主按钮隐藏动画
+        binding.mainFloatButton.animate()
+            .scaleX(0f)
+            .scaleY(0f)
+            .alpha(0f)
+            .setDuration(150)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.mainFloatButton.visibility = View.GONE
+                }
+            })
+            .start()
+
+        animSet1.start()
+        animSet2.start()
+    }
+
+    /**
+     * 收起子按钮
+     */
+    private fun collapseButtons() {
+        isExpanded = false
+
+        // 隐藏遮罩层
+        binding.maskView.animate().alpha(0f).setDuration(200).withEndAction {
+            binding.maskView.visibility = View.GONE
+        }.start()
+
+        // 子按钮1动画（回到原位）
+        val sub1TransX = ObjectAnimator.ofFloat(binding.subButton1, "translationX", binding.subButton1.translationX, 0f)
+        val sub1TransY = ObjectAnimator.ofFloat(binding.subButton1, "translationY", binding.subButton1.translationY, 0f)
+        val sub1Alpha = ObjectAnimator.ofFloat(binding.subButton1, "alpha", 1f, 0f)
+        val sub1Scale = ObjectAnimator.ofFloat(binding.subButton1, "scaleX", 1f, 0f)
+        val sub1ScaleY = ObjectAnimator.ofFloat(binding.subButton1, "scaleY", 1f, 0f)
+
+        val animSet1 = AnimatorSet()
+        animSet1.playTogether(sub1TransX, sub1TransY, sub1Alpha, sub1Scale, sub1ScaleY)
+        animSet1.duration = 200
+
+        // 子按钮2动画（回到原位）
+        val sub2TransX = ObjectAnimator.ofFloat(binding.subButton2, "translationX", binding.subButton2.translationX, 0f)
+        val sub2TransY = ObjectAnimator.ofFloat(binding.subButton2, "translationY", binding.subButton2.translationY, 0f)
+        val sub2Alpha = ObjectAnimator.ofFloat(binding.subButton2, "alpha", 1f, 0f)
+        val sub2Scale = ObjectAnimator.ofFloat(binding.subButton2, "scaleX", 1f, 0f)
+        val sub2ScaleY = ObjectAnimator.ofFloat(binding.subButton2, "scaleY", 1f, 0f)
+
+        val animSet2 = AnimatorSet()
+        animSet2.playTogether(sub2TransX, sub2TransY, sub2Alpha, sub2Scale, sub2ScaleY)
+        animSet2.duration = 200
+
+        animSet1.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                binding.subButton1.visibility = View.GONE
+            }
+        })
+
+        animSet2.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                binding.subButton2.visibility = View.GONE
+            }
+        })
+
+        // 主按钮显示动画
+        binding.mainFloatButton.visibility = View.VISIBLE
+        binding.mainFloatButton.animate()
+            .scaleX(1f)
+            .scaleY(1f)
+            .alpha(1f)
+            .setDuration(200)
+            .setStartDelay(100)
+            .setListener(null)
+            .start()
+
+        animSet1.start()
+        animSet2.start()
     }
 
     companion object {
diff --git a/module_gjc/src/main/res/drawable/bg_float_button.xml b/module_gjc/src/main/res/drawable/bg_float_button.xml
new file mode 100644
index 0000000..d69afe7
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_float_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#699cf8" />
+</shape>
diff --git a/module_gjc/src/main/res/drawable/ic_float_button_weighing_start.png b/module_gjc/src/main/res/drawable/ic_float_button_weighing_start.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b3b61ab369c1cd472752dd560ab658a4d6a69b8
GIT binary patch
literal 1813
zcmV+w2kQ8VP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il000KcNkl<ZcmeEP
zL6X}x5EOHYUzOEg;;JN{u=9yHRnA|ud6jbtJ*^_QWUfen7z{B3_7<nOB7m9ho(8Ft
z_|t`dr&fRlICc9k7aD*DIJp8Rr_Vb84RCS=PEMb902<)r3Y?VwOq+LrS&5ULX@HY9
zex^+W%u1Z}Oaq*>@iT22U{>O!XByz7jh|_o7~r?B-(LRs`t9@Y|NM8GVwCeyaYJpy
zOj3IWAB1pd$_E&<T$byr8UO$x(l89SaTq>Hv6m_2blCBN+6ciiYK<T{Zs3Cu22J?@
zgO-nQ_~EExfXBv5c8DY=9|w$3BHF}h6c+CIh$+>^7GC$GiUHtE$>vHZ!Si;&1R~n)
z?Ly)o7-r&>nAvU^oPbk{Ky82;AhaYh*WbUF<jjS*IrCc20Z!bhG&ocSK=T1Y1K`ND
zz?u?l&z<5(>}$2;PKEDUYs1OwDg!{!WCdpvwgiKr1+LpinP7W%yrfM1Y|(tJ*Z`WM
zbMZ!Jm0*o9Z<duN7MoVqZsuMcl!e7bSCcj#kUQEhjUg13*Wi{u7S#;BXyY*u)znGc
zYYi(lfW~!eU=F<gPO!j_G?i?{22fSyVmAuV0B%~*1_%w%Mt3(=X#h8^Xaj@>XrsHE
zsx*L`R<r>^1GLfou&Sv-G(bwB&c|th&KsPfM+2l3>U^9A=)A!xdNe>vq0Yx?fX*A7
zqDKRy6zY7O2I#cGxwL42T%|glM+0=)*j!pPK(11q&Z7Z3ZEP+r8X#AxPUq18oi;X?
z77dWARHyT3fX*7bmktfESFz6K(*T_{bT6H=8sK#))ZZUJyt}rX)8pr21B~PNXH-Fk
zar}1$dq@)qpW<E=8(>91UJj-}u>m6AGXK9^p6>LhceOP>myEw+10c8N)`Rse0+`p#
zJ6(Tjjuu#RYHsn#S+6p{UmrhwmLj19n=lLP=SQ@=z|7}4oAgzc0gyhDVAw6dycM_$
z<jmX3anx81oN5C^5e#DG?iS3${G%FKQU~~evt;e#8npqC3_!m8`ttx#`0OlR<t}vv
z#yz+&zb8Ix+^ZO1PCkn^3D@$w0czhHFUGv$E;VD^a|Rz-e>e8TY0vVSbF1)q2B@k5
zPynJKM7XPj=r&%l1CI*SltAs`#)HRWfDc0Q4v3?;pbqLuROR!?t-1joljDEvz9R!Q
zt)nMC<_55C2J`C_paFFHHD9d-Km%wM48EQQ2;M*~d>TNjVDR;32Eb3RBJdOJM+RzI
z^#r*QNAf`}D?Z3u)c_C&FI<oqhhezCY)St4bY!3|>Py_;9tM({@W4s9+~2rnVTNi3
z062&*V!!(#X1UhlxW7FNxJrv-ttU>{NH7C%m2z6Ht6~5FbpyC%au1(@OYn`@$$Rj~
z8rPg^nLurT35b_nzuIHj$=UDLiNFcQo^Y;m&KXb{0000ar;vj=S#J%C#0lE(y|XR*
zpfUgeEE9VE47@49Fvl~8CAK|xw&hxUE;aym3KB#MA-wvy3d%|K5-iapS_^e}Wrv4+
zG1L}oY2vD>x7J}y*5b53dK6MPWq(oJubABm!Ch?XVgm@BV%N#qmPb_FTbdPf(imV1
zP`I(wm&0&`G6B;7nL>G)RvQNmP+QSp`DlP(4XX{82B@uQuzWN?u!hx!O9RwaG*~_w
zAXvj{!=(XgD;g{x4G^SZRxoJ*D`kV^r2&F8$_ge8V5Mx3yfi?NMp?n60j!h_l9vVu
z(kLsKG=P<|LGsc7&KqS7j|Q+-*m-^$z<GnL;n4ur3OmnF12}JxH9Q)?T4Cq;X#nR9
zvW7<kSS##2KMmltK}W&T7yv(Dd=yUeI{5il^CETyihH3kfE^v%%v)k@joG47WFOYw
zf|kr$Y=Chbi(gfiL}fT(ORTLiLr6_i7aO1{YNO(sw{ICi%1W!jU2Fh6GiAqwx(fg=
ze)oS(RdABAP>%s{ns5vB{YS9@P-+r0j9?R9Kwph$kG336t7K(BWdK=!i6R(w3h<@^
zyGb}*Q}aBG=W^P@sx|-ws{v#Sq;?Dq-Lq3#a?0fTx|h>hUbO*`7~+2M`PQ&k;6g)z
zb5D5Xgv}<Ls=W`XiUDR}AsU<skO;Yc^!EeQyYCL*fKY-#b$H_hJSswq#Z?V}+}LdZ
zi9iD+?r+*U==}C}E#Ls28i8EkgAg955uVemOLYUxiFuBp01XhMPi81-05fT0B&Gpk
z^vMh*4PYkizQnC&(*UiMcT$%IaMFlYFlc~Q$~&n`12}0!D;P9DE9ITkr2(8Yq7@7p
zpq27Y>e2v>8_~M_cK`qY|Np_63WWdw00v1!K~w_(;EWASLiW2v00000NkvXXu0mjf
DHAgh-

literal 0
HcmV?d00001

diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
index 858e0fe..2d56ca6 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml
@@ -11,19 +11,23 @@
             type="com.lukouguoji.gjc.viewModel.GjcWeighingStartViewModel" />
     </data>
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_f2"
-        android:orientation="vertical">
+        android:background="@color/color_f2">
 
-        <include layout="@layout/title_tool_bar" />
-
-        <!-- 主内容区域 -->
-        <ScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include layout="@layout/title_tool_bar" />
+
+            <!-- 主内容区域 -->
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -432,4 +436,46 @@
 
 
     </LinearLayout>
+
+    <!-- 浮动按钮组 -->
+    <!-- 遮罩层（点击收起） -->
+    <View
+        android:id="@+id/maskView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <!-- 子按钮1 -->
+    <View
+        android:id="@+id/subButton1"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="70dp"
+        android:background="@drawable/bg_float_button"
+        android:visibility="gone" />
+
+    <!-- 子按钮2 -->
+    <View
+        android:id="@+id/subButton2"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="70dp"
+        android:layout_marginBottom="25dp"
+        android:background="@drawable/bg_float_button"
+        android:visibility="gone" />
+
+    <!-- 主浮动按钮 -->
+    <ImageView
+        android:id="@+id/mainFloatButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/ic_float_button_weighing_start" />
+
+</FrameLayout>
 </layout>