From 3f80dfe096ec9a1389148b293ef0a961c9beb18c Mon Sep 17 00:00:00 2001
From: adam <itgaojian@163.com>
Date: Tue, 31 May 2022 09:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/notify/NoticeDetailActivity.java |  4 ----
 .../res/layout/activity_notice_detail.xml     | 22 +++++++++++--------
 .../main/res/layout/activity_notice_list.xml  |  8 +++----
 oamodule/src/main/res/layout/item_notice.xml  | 18 ++++++++++-----
 4 files changed, 29 insertions(+), 23 deletions(-)

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" />
 
             <LinearLayout
@@ -56,8 +57,8 @@
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
                     android:src="@drawable/ic_read_num_hint" />
 
                 <TextView
@@ -66,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:gravity="center"
-                    android:textSize="@dimen/text_12"
+                    android:textSize="@dimen/text_14"
                     tools:text="129" />
             </LinearLayout>
 
@@ -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="类型" />
 
             <TextView
@@ -92,7 +95,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:textSize="@dimen/text_12"
+                android:gravity="center_vertical"
+                android:textSize="@dimen/text_14"
                 tools:text="等级" />
 
             <TextView
@@ -100,9 +104,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
                 android:text="已读"
-                android:textColor="@color/red_ff"
-                android:textSize="@dimen/text_12" />
+                android:textSize="@dimen/text_14" />
         </LinearLayout>
     </LinearLayout>
 
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" />
         </com.scwang.smart.refresh.layout.SmartRefreshLayout>
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">
 
     <TextView
         android:id="@+id/tv_title"
@@ -19,7 +22,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="7dp"
         android:orientation="horizontal">
 
         <TextView
@@ -27,7 +30,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight=".3"
-            android:textSize="@dimen/text_12"
+            android:textColor="#8e8e8e"
+            android:textSize="@dimen/text_14"
             tools:text="类型" />
 
         <TextView
@@ -37,7 +41,8 @@
             android:layout_marginRight="10dp"
             android:layout_weight=".5"
             android:gravity="right"
-            android:textSize="@dimen/text_12"
+            android:textColor="#8e8e8e"
+            android:textSize="@dimen/text_14"
             tools:text="2022-12-12 12:12:12" />
 
         <LinearLayout
@@ -47,8 +52,8 @@
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="12dp"
-                android:layout_height="12dp"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
                 android:src="@drawable/ic_read_num_hint" />
 
             <TextView
@@ -56,6 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="3dp"
+                android:textColor="#8e8e8e"
                 android:textSize="@dimen/text_12"
                 tools:text="999" />
         </LinearLayout>