diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c391fb73f..17c51d871 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4158,7 +4158,7 @@
開始日期和結束日期相差不得超過6個月
已同意
已拒絕
- 已過期
+ 已失效
已處理
群ID為空
獲取群信息失敗
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
index f45d4ee6f..8acb0dfa8 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
@@ -11,6 +11,7 @@ import android.util.TypedValue;
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.widget.AppCompatTextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.alibaba.fastjson.JSON;
@@ -52,12 +53,12 @@ public class HallMsgViewHolder extends MsgViewHolderBase{
private ConstraintLayout clContainer;
private TextView tvTitle;
- private SuperTextView stvAgree;
+ private AppCompatTextView stvAgree;
private TextView tvContent;
private View llOpLayout;
private SuperTextView stvReject;
private View llResultLayout;
- private TextView tvResult;
+ private SuperTextView tvResult;
public HallMsgViewHolder(BaseMultiItemFetchLoadAdapter adapter) {
super(adapter);
diff --git a/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml b/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
index 382015a88..7350c6ac6 100644
--- a/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
+++ b/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
@@ -6,41 +6,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@id/view_space"
+ tools:visibility="gone">
+ android:textColor="@color/color_6D6B89"
+ android:textSize="@dimen/sp_14"
+ app:corner="@dimen/dp_15"
+ app:solid="@color/color_E6E6F0" />
-
+ android:textColor="@color/color_white"
+ android:textSize="@dimen/sp_14"
+ android:background="@drawable/bg_common_confirm_15" />
@@ -86,27 +49,67 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
- tools:visibility="visible"
+ android:layout_marginBottom="@dimen/dp_26"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toBottomOf="@id/view_space">
+ app:layout_constraintTop_toBottomOf="@id/view_space"
+ tools:visibility="visible">
+
+
-
-
+ android:background="@color/line_353548" />
+
+
+
+
+
+
\ No newline at end of file