From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/res/layout/activity_family_memorabilia.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/activity_family_memorabilia.xml b/app/src/main/res/layout/activity_family_memorabilia.xml
index 5533cfe..180a3a3 100644
--- a/app/src/main/res/layout/activity_family_memorabilia.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia.xml
@@ -10,32 +10,34 @@
type="com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivityViewModel"/>
</data>
+ <!--绾︽潫甯冨眬锛岃В鍐冲竷灞�宓屽杩囧鐨勯棶棰橈紝浠ョ伒娲荤殑鏂瑰紡瀹氫綅鍜岃皟鏁村皬閮ㄤ欢銆�-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.function.FamilyMemorabiliaActivity"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
+ <!--鏍囬鏍�,瀹冪揣鎸ㄧ姸鎬佹爮鐨勪笅闈紝姝ｅ父鎯呭喌涓嬪畠鐨勫竷灞�鍜屼富棰樻牱寮忛兘鏄娇鐢ㄧ郴缁熷畾涔夊ソ鐨勶紝涓旈粯璁ゆ儏鍐典笅鍙樉绀哄浘鏍囧拰鏂囨湰銆�-->
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
>
+
<FrameLayout
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginHorizontal="16dp"
android:layout_gravity="center_vertical|end"
- >
+ android:layout_marginHorizontal="16dp">
+
<ImageView
android:id="@+id/iv_operate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:background="@drawable/ic_operate"
- />
+ android:background="@drawable/ic_operate" />
</FrameLayout>
<LinearLayout
--
Gitblit v1.9.1