From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java
index cc69d3d..364ceeb 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java
@@ -1,5 +1,7 @@
 package com.application.zhangshi_app_android.ui.function;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.view.View;
 import android.view.ViewGroup;
@@ -123,14 +125,22 @@
     }
     public void expendView(View initialView){
         int initialHeight = initialView.getMeasuredHeight();
-        initialView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+        initialView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         int targetHeight = initialView.getMeasuredHeight();
         ValueAnimator animator = ValueAnimator.ofInt(initialHeight,targetHeight);
         animator.addUpdateListener(animation -> {
             initialView.getLayoutParams().height = (int) animation.getAnimatedValue();
             initialView.requestLayout();
         });
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                initialView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+                initialView.setLayoutParams(initialView.getLayoutParams());
+            }
+        });
         animator.setDuration(500);
         animator.start();
     }
+
 }

--
Gitblit v1.9.1