diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeDetailActivity.java
index e3cddb1..eed5715 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeDetailActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeDetailActivity.java
@@ -1,6 +1,5 @@
package com.tenlionsoft.oamodule.activity.notify;
-import android.graphics.Color;
import android.net.http.SslError;
import android.os.Build;
import android.text.TextUtils;
@@ -142,15 +141,12 @@ public class NoticeDetailActivity extends BaseActivity {
switch (bean.getNoticeLevel()) {
case "1":
mTvLevel.setText("紧急");
- mTvLevel.setTextColor(Color.RED);
break;
case "2":
mTvLevel.setText("一般");
- mTvLevel.setTextColor(Color.GREEN);
break;
case "3":
mTvLevel.setText("普通");
- mTvLevel.setTextColor(Color.BLACK);
break;
}
diff --git a/oamodule/src/main/res/layout/activity_notice_detail.xml b/oamodule/src/main/res/layout/activity_notice_detail.xml
index 967d00f..f7e6dd6 100644
--- a/oamodule/src/main/res/layout/activity_notice_detail.xml
+++ b/oamodule/src/main/res/layout/activity_notice_detail.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/gray_bg"
+ android:background="@color/gray_f2"
android:orientation="vertical"
android:scrollbars="none"
tools:context=".activity.notify.NoticeDetailActivity">
@@ -42,7 +42,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:textSize="@dimen/text_12"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_14"
tools:text="发布时间:2022-22-22 12:12:12" />
@@ -76,6 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
+ android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:gravity="center"
android:orientation="horizontal">
@@ -84,7 +86,8 @@
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_12"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_14"
tools:text="类型" />
+ android:textSize="@dimen/text_14" />
diff --git a/oamodule/src/main/res/layout/activity_notice_list.xml b/oamodule/src/main/res/layout/activity_notice_list.xml
index a07d6b6..4c8398b 100644
--- a/oamodule/src/main/res/layout/activity_notice_list.xml
+++ b/oamodule/src/main/res/layout/activity_notice_list.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/gray_bg"
+ android:background="@color/gray_f8"
android:orientation="vertical"
tools:context=".activity.meeting.MeetingCenterActivity">
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="true"
- android:drawableLeft="@drawable/ic_arrow_cir"
+ android:drawableLeft="@drawable/ic_date_title_icon"
android:focusable="true"
android:gravity="center"
android:hint="开始日期"
@@ -78,8 +78,8 @@
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
android:background="@color/white"
tools:listitem="@layout/item_notice" />
diff --git a/oamodule/src/main/res/layout/item_notice.xml b/oamodule/src/main/res/layout/item_notice.xml
index dbf08fd..50b98d6 100644
--- a/oamodule/src/main/res/layout/item_notice.xml
+++ b/oamodule/src/main/res/layout/item_notice.xml
@@ -3,8 +3,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
android:orientation="vertical"
- android:padding="5dp">
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp">