From d81bbb6c8cc7de2227eab7edf659e5c4e5092057 Mon Sep 17 00:00:00 2001
From: adam <itgaojian@163.com>
Date: Wed, 13 Jul 2022 16:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=81=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=B7=BB=E5=8A=A0=E5=8E=9F=E7=94=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../just/agentweb/BaseJsAccessEntrace.java    |  46 +-
 .../baselib/core/retrofit_net/BaseUrlApi.java |   4 +-
 .../core/widget/calendar/CustomMonthView.java |   2 +-
 .../tenlionsoft/baselib/utils/TimeUtils.java  |  56 +++
 .../res/drawable-xhdpi/ic_line_hor_gray.png   | Bin 0 -> 84 bytes
 .../ic_meeting_content_icon.png               | Bin 0 -> 691 bytes
 .../drawable-xhdpi/ic_meeting_emcee_icon.png  | Bin 0 -> 815 bytes
 .../drawable-xhdpi/ic_meeting_join_icon.png   | Bin 0 -> 1343 bytes
 .../drawable-xhdpi/ic_meeting_notice_icon.png | Bin 0 -> 1052 bytes
 .../drawable-xhdpi/ic_meeting_room_icon.png   | Bin 0 -> 757 bytes
 .../drawable-xhdpi/ic_meeting_state_off.png   | Bin 0 -> 2105 bytes
 .../drawable-xhdpi/ic_meeting_state_on.png    | Bin 0 -> 2705 bytes
 .../drawable-xhdpi/ic_meeting_type_icon.png   | Bin 0 -> 758 bytes
 baselib/src/main/res/values/colors.xml        |   2 +-
 baselib/src/main/res/values/styles.xml        |  23 +
 .../meeting/MeetingApplyActivity.java         |  18 +-
 .../meeting/MeetingCenterActivity.java        |  12 +
 .../meeting/MeetingDetailActivity.java        |  14 +-
 .../activity/oaflow/OaFlowCenterActivity.java |  48 +-
 .../adapter/MeetingMineApplyAdapter.java      |  26 +-
 .../adapter/MeetingMineJoinEmceeAdapter.java  |  27 +-
 .../holder/MeetingRoomRecordHolder.java       |  18 +-
 .../res/layout/activity_meeting_apply.xml     | 424 +++++++++-------
 .../res/layout/activity_meeting_detail.xml    | 460 ++++++++++--------
 .../res/layout/item_meeting_room_record.xml   | 120 +++--
 25 files changed, 817 insertions(+), 483 deletions(-)
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_line_hor_gray.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_content_icon.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_emcee_icon.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_join_icon.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_notice_icon.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_room_icon.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_state_off.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_state_on.png
 create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_meeting_type_icon.png

diff --git a/agentwebnodule/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java b/agentwebnodule/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java
index 9e87398..e3216d6 100644
--- a/agentwebnodule/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java
+++ b/agentwebnodule/src/main/java/com/just/agentweb/BaseJsAccessEntrace.java
@@ -29,32 +29,37 @@ import androidx.annotation.RequiresApi;
  */
 public abstract class BaseJsAccessEntrace implements JsAccessEntrace {
     private WebView mWebView;
-    public static final String TAG=BaseJsAccessEntrace.class.getSimpleName();
-    BaseJsAccessEntrace(WebView webView){
-        this.mWebView=webView;
+    public static final String TAG = BaseJsAccessEntrace.class.getSimpleName();
+
+    BaseJsAccessEntrace(WebView webView) {
+        this.mWebView = webView;
     }
+
     @Override
     public void callJs(String js, final ValueCallback<String> callback) {
+        LogUtils.e("WebView", "调用的==" + js);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             this.evaluateJs(js, callback);
         } else {
             this.loadJs(js);
         }
     }
+
     @Override
     public void callJs(String js) {
-        this.callJs(js,  null);
+        this.callJs(js, null);
     }
 
     private void loadJs(String js) {
         mWebView.loadUrl(js);
     }
+
     @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-    private void evaluateJs(String js, final ValueCallback<String>callback){
+    private void evaluateJs(String js, final ValueCallback<String> callback) {
         mWebView.evaluateJavascript(js, new ValueCallback<String>() {
             @Override
             public void onReceiveValue(String value) {
-                if (callback != null){
+                if (callback != null) {
                     callback.onReceiveValue(value);
                 }
             }
@@ -64,26 +69,27 @@ public abstract class BaseJsAccessEntrace implements JsAccessEntrace {
 
     @Override
     public void quickCallJs(String method, ValueCallback<String> callback, String... params) {
-        StringBuilder sb=new StringBuilder();
-        sb.append("javascript:"+method);
-        if(params==null||params.length==0){
+        StringBuilder sb = new StringBuilder();
+        sb.append("javascript:" + method);
+        if (params == null || params.length == 0) {
             sb.append("()");
-        }else{
+        } else {
             sb.append("(").append(concat(params)).append(")");
         }
-        callJs(sb.toString(),callback);
+        LogUtils.e("TAG", sb.toString());
+        callJs(sb.toString(), callback);
     }
 
-    private String concat(String...params){
-        StringBuilder mStringBuilder=new StringBuilder();
-        for(int i=0;i<params.length;i++){
-            String param=params[i];
-            if(!AgentWebUtils.isJson(param)){
+    private String concat(String... params) {
+        StringBuilder mStringBuilder = new StringBuilder();
+        for (int i = 0; i < params.length; i++) {
+            String param = params[i];
+            if (!AgentWebUtils.isJson(param)) {
                 mStringBuilder.append("\"").append(param).append("\"");
-            }else{
+            } else {
                 mStringBuilder.append(param);
             }
-            if(i!=params.length-1){
+            if (i != params.length - 1) {
                 mStringBuilder.append(" , ");
             }
         }
@@ -92,11 +98,11 @@ public abstract class BaseJsAccessEntrace implements JsAccessEntrace {
 
     @Override
     public void quickCallJs(String method, String... params) {
-        this.quickCallJs(method,null,params);
+        this.quickCallJs(method, null, params);
     }
 
     @Override
     public void quickCallJs(String method) {
-        this.quickCallJs(method,(String[])null);
+        this.quickCallJs(method, (String[]) null);
     }
 }
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
index d576eec..9fbbadf 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
@@ -7,8 +7,8 @@ package com.tenlionsoft.baselib.core.retrofit_net;
  */
 public class BaseUrlApi {
 
-    //    public static final String IP = "http://192.168.0.3:8080/";/* 测试IP */
-    public static final String IP = "http://121.36.71.250/";/* 测试IP */
+        public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */
+//    public static final String IP = "http://121.36.71.250/";/* 测试IP */
     //    public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */
     public static final String SYS_USERCENTER = "usercenter/";
     public static final String SYS_POPULATION = "population/";/*人口系统*/
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java
index d639a40..4453725 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/calendar/CustomMonthView.java
@@ -134,7 +134,7 @@ public class CustomMonthView extends MonthView {
         if (calendar.isCurrentDay() && !isSelected) {
             canvas.drawCircle(cx, cy, mRadius, mCurrentDayPaint);
         }
-        LogUtils.e("是否有Scheme==" + hasScheme);
+
         if (hasScheme) {
 //            canvas.drawCircle(x + mItemWidth - mPadding - mCircleRadius / 2, y + mPadding + mCircleRadius, mCircleRadius, mSchemeBasicPaint);
 //            mTextPaint.setColor(calendar.getSchemeColor());
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java
index 71e4b8d..a0e771e 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java
@@ -242,6 +242,25 @@ public final class TimeUtils {
             return false;
         }
     }
+    /**
+     * 比较时间的大小,用当前时间与给定时间进行比较
+     *
+     * @param time
+     * @return
+     */
+    public static boolean compareToCurrent(String time,String fm) {
+        SimpleDateFormat format = new SimpleDateFormat(fm);
+        String nowString = getNowString(format);
+        try {
+            Date a = format.parse(nowString);
+            Date b = format.parse(time);
+            //Date类的一个方法，如果a早于b返回true，否则返回false
+            return a.before(b);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 
     /**
      * @return false 下午 true 上午
@@ -361,6 +380,34 @@ public final class TimeUtils {
         return format.format(date);
     }
 
+    public static String dateToStringMonthDayTime(final Date date) {
+        SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
+        return format.format(date);
+    }
+
+    public static String dateToStringMonthDayTime(final String date) {
+        SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
+        SimpleDateFormat pars = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date parse = pars.parse(date);
+            return format.format(parse);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+    public static String dateToStringMonthDayTimeChinese(final String date) {
+        SimpleDateFormat format = new SimpleDateFormat("MM月dd日HH:mm");
+        SimpleDateFormat pars = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date parse = pars.parse(date);
+            return format.format(parse);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
     /**
      * Date to the formatted time string.
      *
@@ -1841,7 +1888,16 @@ public final class TimeUtils {
             e.printStackTrace();
             return "";
         }
+    }
 
+    public static String getDayOfWeek(Date date) {
+        String[] weekDays = {"日", "一", "二", "三", "四", "五", "六"};
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0)
+            w = 0;
+        return weekDays[w];
     }
 
     private int getDayofWeek(String dateTime) {
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_line_hor_gray.png b/baselib/src/main/res/drawable-xhdpi/ic_line_hor_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..c92618468cd3ad8f367e7f3475ae8510cc24d411
GIT binary patch
literal 84
zcmeAS@N?(olHy`uVBq!ia0vp^%s|}52qHrxliq*?0(?ST-@kwVX8NvPAeYC}#WAE}
ePO=261Oo%32m@nW)mk~AID@CFpUXO@geCy^`xCza

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_content_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_content_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..feee6049fdc8b921e2fae328af1d9bc3cd80ea7f
GIT binary patch
literal 691
zcmeAS@N?(olHy`uVBq!ia0vp^HbAV)!3-piuJ}<0q!tDEgt!9fK@JuOs#*b^XjT&B
z7tB!4!IqejT9z)9RGVL2!N|m0m=~EN5$h?<m8Roe<0sC~;-W6%n4spa6>V#+T%s42
z6=)>4^VjNc3=E82o-U3d6?2we%Pej(5MX<-XW>*Q7Z%qe+(&=g-TL=`|235xlI|Bc
zPuERIJZ$XfG%a<XF`r|HU;VKN{Y3$yy^^nkbqf+?f8O3z8`d*h{pLK)*&j}AoS3)b
z!vw)atTmc<79{-EmAi8AZbRSCO26acg3&2^j;44X-51lvEUKS!PdVv+Gecd5h2RYC
zBe_Cxjx6^#EEl;Gmps3hMNdTL#O^dlVMW&E0({Aa7gqOK3Y=_aE?NDccl9F16P+{H
z7zOULc9XYy|LTqRp54=zFN<5keZ)!j_TB1V4`1#-s9k%_`uX>{zC9lntz5kMwEy*n
zRh%pLXoUQ1UmMi4bF%xi`F#x=eNJ^Ac3CQaZ^!qkF7DhDkM@0<weP=4QbYd-vzb*f
zt*qt;PO`K+i2cY;Ji-v2eIxpS-n1ZQoz)X>-FW=GKBsNx5`q0k8HLZRd(|B_=LU~H
zt4-V_^Fz&wmp1JYOj}vL=<$+0JhL8(&-ZqYk^8?REd7D+&QQZ2p8l(LD}G;`v}2WY
k*Xu8dtE*%a=HC0vf4ocj$cqF19H6A<>FVdQ&MBb@00koFdH?_b

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_emcee_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_emcee_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d830959d165d9556b375c33a238bc4a33526794c
GIT binary patch
literal 815
zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYgdrx&nMcT!Hi;0m4ii`aq}Xl?3?(
zGt|pwrZcHlRxuh!^VLY^2=XY^mFGKhX_v8tvHJ^KD%iRd#fl~ddYc=hI=FRp?9O0d
zU{dpRaSW-L^ET{u(kcT16*+-`fB+5gqgiYB-uU*v{(Z`}6N;VeX5SX-pPMW>x$&;f
z=GS)$kH1&&ne>7ExcFH^0ilB%Bk!n8*p)r!|FK)XZ$;BS+A}K5yQyWfRlV6}d4kHk
zHzLbQG9uj~T%Jyv7A)N=EL*uk|MjoN4&nHN#f1)>b!^AJ-VhQw7WwpC*}?~^)1q8k
zPqd#7?Fitoo_lwpkH%ge1-|=BYP&u7ir#PbwD<mXV9JdXd;8V?YP{qPX1W<O^UEov
z`Mjr2EeVX{4Sw|Z*W(XG?|nLL?er%fd%i8*OGLv(S<<6bV}{VVn7nga-XA=zV)<Ol
zg4-rwHBU(EgWvHTrv!Z8+uGcjbR)u|urW#O-IGo8E?j@V*_bgv!|0pQ+SglL^41(u
z2>2Hoqj@7yWvA8z^=({2^LHE*yZM}#N$6|kyzs)9r=N?{kC<8HT>UyNTU0hoNuzrm
z&!I&;IhS`Xmb+n@>T>tuhRcderX0Q}tKt%|<(cl+lA~EGx31ax=a2mTvp%17vpV0D
zee1fbZ}pq$+tlR_#g5nXYC6BEhe~BTEnu4yyXe@WzdKcVk1g5M?)vL)>KBzcEMfvZ
zx1O(bdS<;iKxGbR-YTh?MvIiseTkZ><jCtQ!(P4ld!uc>t=rUsdmH{q?7F4DX_eh#
z&j~xb*E4d?@|}|YLg?O&B~AbTYc#YR)L~aS@#naqiIUEiiQlarIcm>eq~jLQ>+Ah8
ig~j~L=khy+!vB~A6+{~=mIq%2C3{a-KbLh*2~7Y5v@E~?

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_join_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_join_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..26336c07450ffa4355935db6358070ad5367c3d8
GIT binary patch
literal 1343
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2Jf1AIbUf%I?%wttWD0{!M$666=m
zP+!N$R9jxd#!^+mBP(j3&&d%iW2vqXubEw<BvhQvT9~Xa6(?ZA=j@nL6q6YpXcL+!
z%<Gyfo~EniXQAq;C=zZMY3$+R^QSaNnSp`%l&6bhNX4ADVK=K5`3NkPniVF-80Zor
za_76LRC%(=&-?#7|FN<0CKydV{Zs9ESO24u+~unh>pom>p6d5?@1*@w-CwrvT>EW_
zy}-nPP3P_wy^6l_#j#xAPg6jwU48THTWdH|Z)RT(wcS;rSx|pK>x)`+n{|&sLh=05
zI&o58yBQp2S*nHJN!j;EuB~s!DTDLAEPFO_82N5rcg6am_?wW>_Sxr^Jhb`P3eRWR
z^3>Q>*XQ?WM4v1Rarm?5>x9$$J}c;0%V_gEyt%uR=kQf;hNZ&l`#(0^o$mf5oc#)u
z_vd$vXS4(-mn~WP{?ccw<d*Y6lV)c&DF^FaE;^WZyr+%zK^0?qdPn%4^@|++E9ZRo
zo+7wF|M(hztGCnRU;Bv8>b8iS)$r82QI{cR-lJ#bx61X^mzBBt+2-ZWFnC$PA0z0n
z{^;3Yxdkt_Yla^>U9taE_KPgLn+u+_%=o<J-oA9T&263k6Q|tazGuoJ;nwY2{F3tk
zyKU9XX1Vp|yw&0<QGpAqIwH5qGF?7@YV{30xfv#oR};!q=4Kh29cDFuVcfe=hih-e
z`WrQ#H-4)xd(ATQV%$;@LAKQWKDUIzZc9vWGj^G#FQj&vz3{tXcAmFs(HG&Tr}!=k
z_by=yySV4!@668%a_^ZBNY=8vdz*0DL!+l?mra~zT&R`%s^tp>O=hnx375FCR@@|f
zz0&Tv0*(_TWwopSOiPwdW;k<xd0Wi7*L<;T&1GFHWtOe;nELmm-4iY~CKo-a$uldZ
zd4!!dd`}46@4u{p(XH`}lE>+t3KO5NyBG5Rbk_PUE{p=(?q~d4DeK>IT8(4p#NQ9%
zf+}_`ak}#4UWe5|rT9(Z&z8KKx=u~}>ERGA8=JQkPt}ZG&Q(}0D;K6chx4xa>f+r2
zKQ)%#;t6k7)tWtH&;O+5pIE}zKfLFeyC?LipZLcoMWHNZ7mFv}`@+fDHedTzMeS<l
z?@>%fulA}`&)mC<gRSkmV)Q)W+si|qWrXhEX_zB0>)%h$C&wCAssAs`UT7(*IGcT6
z_3P?$Oh$XI>$SNGf4Cu@*UMKiFLjghmHl^FZvB1Jp7G^y=jCG+Q&RmR_N<?}l40pt
z=9g^=-Ab?68@GD@IHL1%L+iF_tS^2%EnVa5@a9+i7Pk#4&l2v2U5aBd-59R?;FQvg
ze{VJ#+oZFtkUTbX*`;NnKZNEMR;cQ<GAcia%%})!RAIO63b8x$CR9YibJyL>5c%yI
zcFfUk0&6C15s6%s&!n;c;iWuFgPJeX7YcXWFYvsu^!>5*M*PO}^#4tZvE*-SWq+S~
hm_zJ0f8B@mkL%+&L#iw}F3txPgPyK_F6*2UngEGx`gQ;S

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_notice_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_notice_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d23e19201626e39b5d8a28a65765b22e4f0744a3
GIT binary patch
literal 1052
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2I&1AIbUf%MP?uP+s!0lMD4B*-tA
zp}vlZmAiz|U9cuwsnWcVGd)PcD3P7t)FDs9twJP9&NEg~JkUblH!RbNuPlMh#a2x?
zO}8|~UrL!*CRkfy#bbL02B!0#E{-7;bMA({tXkwCu%)q~OQDl3;Df_aWvTTuDxOsQ
zKYmN9|GZ;j*^T<yzu27(ZDa3V4gL{&VNScW4v*)mz*X%>RSqRaPgS<&?ao`M6KnbD
z`e)hc8g&yMWqlP3{Q8mWv#9m&St2*P56%r+w;{gc%-)zQf7LENdHZWkU&$g5y{z(8
z0hOm%U-pV#V&0ju|7(X??K{__K5j}4yW0Gc+q+X*Jyb3~b#bYhTWvT)ICpo@9VgD0
zudeR!s5|ANDBj8Ns$+#r(ao8*f~L$nd*||*Jl$uy>%z<3D(>qdm-yJNKcCmU!gNZu
zrs(~B>vo9ehFt&SotMl$%dTi;sQZPLJ0>WzdxW3KJQZ|di??{ip?z}}sJq=M78hMy
zK2NVhx;ZCrrR%9{-pdpiwNI(7-w^X8Xmy+UlcG5%uTHq7bzivkR^Gpwwv`8j&UmT)
zWSCgpDQ2+8@omdtwv@lNyB*88BFlbFl0G<lN}}2I)k?1-UroC8<3Q(hrh~OEvdhC4
z_5QyUap6i9|J4$Y*k6th1Km?NV*kW`f1SQ(f9&r~`&qwFy!>A-vB=Lv|7gmahgn@a
z#kYmAM}3f(yUpy@24*Aeq~9{LezD4LkXu@RD@*LrLM?$G9Jz0Ar|V2y@a&|WoRmPs
z{8KY;2xeb-dAZPShcnNr{?uK+RvP3O<cO`XYGPUIap`bhfzlOC>rDrpHtf4?xuaET
zwnfjyy9>ChV{d976=dwG=i$yxKBawoe@6*(E?1$!T)UZ{o>_@+H;`67*xvNHx4y&5
zLiCNFk$gt-l+~&)9+a@WxO*ad!)%Wk(|0%UPI|wYukZ6*@eda`uF4AeeclryBiXvv
z`1q|S8ZV4{8n%kKR0;aD>sUP3O#D_XFQLr7xmVJ2g84<B>S<}KeoYd;%5tUrncFX~
zcgM<^mviK;*4T2&rzXiI+IlDVec3xpgXR@{-w<PP>s!GGex<oLxy`2+|0(~${4Ubi
U^2LRdRiHfX>FVdQ&MBb@0E2plBLDyZ

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_room_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_room_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..179e21b13aa833066630bddc46ec8bc6fc4a126e
GIT binary patch
literal 757
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`Ee-GqaRt(YAB6n#d<b-<c}b98
zFhji*dr)eH15*u49cMXjDWiQLM@FSeb-ui|Q;fK`Om>MtsIdpPfm*V%S)pI9tERAJ
zoJ~aHWIKIz1_s6xo-U3d6?5KByIIv_AkZqCo8r#MC>mJE=vtV6|Nlj+#O1m!)$aS}
zX$w6+uX9qR?3U8h>T1V1vy$d;>YsQLl%u_;iSxEd^vjga$AXC&EpFb6)^~l`WpO$A
z>VkH+yQj|Be-k&16RB@J*?)PKT(w$S#NCR&5q8TR>?@ciFaB6JtFX<OK|=q=j5XW}
zbIT4_7?k{C@H$~^Xxa7qytmFdp`a_`%%3x_^IbTaaHzbB@1Maoq2s<YYPM~Z)R*$j
zSYA{+VOr!Y-WfLTT|QPuPu;9qKR>#XyhUotA^o##oo%~MZ(k&5o#40Fz|ZwcM&cCL
zN#e}G8$R7!lIC@MLrO^h&vUm<sUL05yZATD{qYw0)A!a!t+Y>?c+p4lqWPJl#@aLg
zy3M>%$-Mnl{kJ=_Emo%;^6xy<CSs&3Z+2>@bnoew^UMCq)xTvGcz1Klw!-}ZqOqLc
zVkT9;XcW0WG3R3+?=$7d>GP8_94{8}MkVyP__5n9tI@apwAE;v5XbbI9S5yHUzifK
zXkjT!gn0PQj%ee3MjPd3$(~M|#=gM#Zel=z_Voh?R^4#DV0vh){VLTN58_o09s1TJ
v9^x!y={jTMhLe^jy5@WCJ-eEHzv?fRsXyfeRD#!l(lLXltDnm{r-UW|Sd#v6

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_state_off.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_state_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7410a4ab39c6a674a31d8c3a99018b7e3744f4
GIT binary patch
literal 2105
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

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_state_on.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_state_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..77359db5c62c291584bd6af049e4a40c94d27bc3
GIT binary patch
literal 2705
zcmV;C3U2j@P)<h;3K|Lk000e1NJLTq0043T0043b1^@s6kKKiR00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA3N}eZK~#90?VS&d6xAKaFH)=hW7TTW8l%Kw
z(=^qZs!dHvIKex1uc+AeXi{SYR7gaLhL+lv9RECSuasJA5Cv-qC_M@oTa6){kRJX4
zdcqwXckFV1IpF^7(Uwr<&&-=&-*<NBxI1=tW@mQx?aaKFd~<udGjD$LKJ(uDz4v}^
zx2P!BX)#?=R7{`yb~$~1TrpjKV>x}{hWqJ@K^DpYWq~q5+300dkg1%;z(@%#JGeSn
zUUs7K72)X`H-j!0T_|1`%22PVA^^(TmwTa1^8=K(?c>9Andlq#yHLjN^`rbr5q*O}
zQ_gGWowMmu(Ki)Tq3m-45uTOkn+dvf?^Z(ehit=?&1vB&`({=;HU%r|4iI;HMH?$+
z0@KRSM2-^+U-~#xHmUwl#wJ!yyLm_Ybe^n@{!q$VDOWMPCw<jqL@K8-qK%TWrxEL!
zat6n{8ZqM|ogDA#g3}`>06ee61cCHcJulsRmHnglrT3Ev(-Uoolrw>$baZ?m-Qf{!
zgj8-MLHa}zq)#M4`a}|>Pb5M5L=vP=RL~%2E}^Tod`!1)+js8v9S!I1!0QJW&=pqB
zomfHNDtTW0*_0~v)v|~d3q{m_hpV;I_>2GXK0e2BR`SDj-{IG<t*6^+8|b@uJ@ZAn
zN^}_&G{~iI(%3^M=&`oA_I`VuHFm^V48rTSe(l`@-85@c9o>}f{7@x(HdLkUFN?6V
z;RvI2!sj>+$EVBdm92E$fi8NqwV(a{B3lO7&ZcAP92_IM%nAzRoNBuAU^h)~k8687
z2N`8j`=Hj`bX0xfx2xzH<NWW<qp$IrR+|Z4I^jH=Z{#(d+p@2f9<XFfoV7J~t542<
zfxa4ekaHt+b+lKj>>6bMGb^~^YVBihZ2XAE{qUDGc1lEhmqXF)fW&z?ANjmgLt|Td
z*ph7Q=sd~J!<MCM>DoYp<V{x%FOV}?6<)FcW4-Jzp@{aD1BgQ~kx#Uj{n3^!gG_Dh
zSL*@^5=~h2gto{=p$%!>F4YOVi-i1~*c0nfU(9ziD;(qpQTjngT<bKcbqS^TY+o0n
z*=utL5kh{**Bn|J;BnUTag-(o3M8Ihe)C$E&FRqVt@Vti{w}v5kstE40*yO5scU5~
zTOBBn?E~r_C(T&ZKXMDv5b||m7ayV=ox7T@4g^Sesy3a9A<bCr4oKu{-Hz0?b$6R`
zUm!qYmIPj>F7ELqn^;YMZM>gO$>V?WLT()$L&!H<TZWW;zp0x&6$p^^N0h0&3F?LP
znt7pMP8si~)k*eW96N2LJ2evdTDB$528M$*-si)Zsz89;P<!TP`^{>iIdi#2ruR(K
zIA6ncuuGj02#`>=GdTs>N2UVFYbJ(PfdSdxuf694WaZoLfJDBwAr4|#qV3IRISL1P
zxQBk7bQWxZ%-=XNJ7KmeP$03!*dA9uG=Jh#_f_?sj2>T;Tad^P`DW^yGYQLFSU(LE
z$l|&5<^5giG$&90Yddr6@VvT1J?+FEtWi#Xj;;(8NJINNlm~esoU&1HXW$)%s?>jm
zbFuot^Qmv6`}E<B4O^Ozv-u**uV6r;W;S%FKgG(s)q>L(bdR6^#nY=!UGx39bX_>2
zZFc}u!}-Vu_Uw)-le4h}6aO6IZxEgmXpqo^$LNZ6+vuifFD=9hLWY7nb)=70Y_6kQ
zuncCLf7i2geR6R*Ymhh(=MT3B;Uq1`*{_ll7U}xKlbHC2EutV69LV89!JwIn_Ng1%
z`qgc11KRf1ezqR{Po{VsD6~v@E?liOb3lp-Kn2I)_)Ph&d5><ubQ^5JaH(xTtwl7z
z;S)4(bKTinM3+@TgLJCmigVv7tyE`*s@VFnYOOUKQU8M|I{d}|cpsnRIMKHH8YDsv
z5nP3^3)DtLti}4+O9*oM@Q`v(HhEoNN?#hSY|ckG=AmwN*5O{ZGEpP7?O1O-)Xkp8
z?2XkB%|L)e2;_mI>cfcLffLi2d6GbbbHU+mLQ}i`eY$aYUK1+ln<Yz?($Zz>&r6<X
zPfe+0Ri(?>?+xL9ypPW(Emlg37n~hG!j>Ak7LFI1&yGPYW@3xJ_So95ZEZS6b2jXv
zn*$4SPm6Ld;zsSb{2hbrH2SPPF?HJHCCZON%UMmbe;lw9*Qy^^r5&8IoNdJUI~$dW
zc$nbC*t3Ow@=5!-ALqN43I$m<kG|5_MGu*HsAfYDYCM)$(Vx1))Vaw#HOJ3KKFBX!
z2!|D6ApoJBe|Ve5`W__WKOKY}4heIjxt^k%^@{UIItZ<dnTPFpkQh9h^*v_73WZw>
z%MYwzwB#*kAkmi}>0@gU(&9^yyJJc*90c=%NL?%Vlb-YW)pXjl+gUS<=mB&ez66Pl
zI8L7Qoh^(WS>--N2n)=0QD-$1p6_3G(Kmbr61%Ljt%0Mp@NfBnXb9JH+FxP}>Kl+R
zze8V#d!F)U)2y_Q)|P+er%4?xT-Omy?wRjsIDeNfKz`7oOh`QeZLN^_Q=Rke0ak_U
zHlJ|Pyt31n@bCr5rfzzoGv#o@8c6h2Zbi+R3D-s6?4(vAJQB-wo(72<z>PR5h>ag5
zh6N%(;<~uL6Z<h^<kmKVyn)18U94Aq-EJXZ2=J$EVjvpA^_>hwuy=Cdx(mCaJqZ$9
z#GMQ~Fm`k+^wFwteb{09VI0(&SGx3l19=096$N~`gYEvMkI{mSVnO2iu)}uq8rRz4
zxd$2~Jl1E{iv@}6!wv~jf|MX7NC{GclprNY3DUP9*K&{pYHg4~BB;!*@2$%lNK8#7
zzuhXZAhGfjsc|QcCvPATRfaXWAcI86<ows&`9`d~u6|%+jQ+(50R)LqPwX1={OX5M
zD;v7hM}i0vD?f9p-P<!MBxVO;_Sj>OAYd%G@*DlsOuT>nv|@|1xK*cGxS1)i!-~C#
zZPkOExu=?sJ(I%1ArXv(4W+1|jl9V*)Ba9%=97PBo5IdFv)Yw{>%$H!_Ts+w#*|X*
z8_CD+<$~BUU{#YADfjRK9S{LB6k$EZ6;!Z0w>$+BDp^L;@a6LPgjg0~oh3`DRP??3
z3M4dn5#5dbjmgbApSc9^Gh=hlq(yYE=zI1hNGS=@w~{{u>I3ON1S)@;*Zb0cnpgf<
zw)ds~ShoE6dhbjB`TC;8bctv~q#T0e42zJY!{c4)j*gLJKj~d1`bQ&`(-_ePN!b(F
z6%9}0X2@ZP*92xo7bWSvdQJ&%HARw6k9Rb}$&t0vyGmOdjWj+?mx(q~Dzm^SBSbyP
z34(&x&;)>Kl1*&E%Ct!xo$j1Xmx?x8YNWs<D~LvtGd_i*kux|FrYGeXqLE}XD^9kX
z)3ixCKzUczj*aES-CjA)bYJ>7(ee<(N#ak6oX*R=^l3NOYM}{GxoYBE`YMJHfTL46
zje%z+YpHditaNX5^m<~!B(&}P>4K36)01!$&`=gSIMh5B`oI4JbkFj#o={q$00000
LNkvXXu0mjfXh%FX

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/drawable-xhdpi/ic_meeting_type_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_meeting_type_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f334166808e120725ed5e3246cef5854630fc7e
GIT binary patch
literal 758
zcmeAS@N?(olHy`uVBq!ia0vp^#z1Vt!3-q-XcnCXQj-IGLR^9LU;|Z^%B4Uz8I}b3
z1vAtO7Rtp~FxE0xvqz_t<Z@@1at7*@SH>$_*OX}l#2SibXi4gss7kxIdE140@;a{M
z?7zvt!1&P9#WAE}&e>_Ni<%4sS{JWX;8?*C7Z4!Qa_jYP`&i4>8A8p$m;Bm4JI|D{
z<2d;)EpmG5w8rbgTMLr9ZM4h8COv0edUDf76Rxw)Nr!eGl1|qN<oRB;u2XY|mwuw1
z?e~{zRo@Ci3>Pb|t2wv%;ZL6Z>URQ9-#Yj*JpAvg`+OgdMQs+&V^2PRB=u(TnR)K3
z*dM(<XyfVqvfxbEr+rd0%KIce=3P9Hpn2O!Ug}IY+vjBmU8K$gHlH+|(ag5_7vp2w
zglUu7O<9e7juzJW@AW^pX<EXBJ&zxM_Fc`8X}mIThQf#GiqDVU&Ps7~tXZ%5^kv9P
zOP#Q%f2<bGbjfZt@1H5UYex4EvBz^-jUT`BbvAeLHFB>FoE)7uOZcR8XXS0zt^eh;
z!`DQYL~i%kn78w2S8rB5PZH17e>q%hEgTkZ{eJsksQ0P|*DH$oWA?}fy5)AgZr%{6
zxu9)_-$yQkeOtD3+*|gC^WTPVk0NtthV!zq2S>A|pQ*nR*RwsfOv-1)!6W<ET>rE)
z*0^}z(iKPM+XvM<{H}fH+_Fr`^}zKrRpogbUuiA~G0r-Yvu^pv6{mN8v);@4JlEh+
zpu@e_f$^dng0Ak*Et=)IZk6ccNi!pzPM$eg*5y4v!s1G8;it)KeqY_b_!payi}aD$
SPg6I7Qm?10pUXO@geCy`-4<*B

literal 0
HcmV?d00001

diff --git a/baselib/src/main/res/values/colors.xml b/baselib/src/main/res/values/colors.xml
index 765407d..d75f21d 100755
--- a/baselib/src/main/res/values/colors.xml
+++ b/baselib/src/main/res/values/colors.xml
@@ -48,7 +48,7 @@
     <color name="tab_blue">#0052D9</color>
     <color name="text_blue_tr">#3300A6FE</color>
     <color name="blue_line">#00BEF7</color>
-    <color name="text_80_gray">#808080</color>
+    <color name="text_80_gray">#9C333333</color>
     <color name="notify_text_color">#FF8B00</color>
     <color name="text_444">#444444</color>
     <color name="text_95">#959595</color>
diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml
index 18b94df..c6e2cc8 100755
--- a/baselib/src/main/res/values/styles.xml
+++ b/baselib/src/main/res/values/styles.xml
@@ -336,6 +336,27 @@
         <item name="android:paddingRight">5dp</item>
     </style>
 
+    <style name="item_hor_content_no_margin">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+
+    <style name="item_hor_content_no_margin_padding">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:paddingLeft">15dp</item>
+        <item name="android:paddingRight">15dp</item>
+    </style>
+
     <style name="item_white">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -444,6 +465,7 @@
         <item name="android:textColor">@color/text_detail_24</item>
         <item name="android:textSize">12sp</item>
     </style>
+
     <style name="item_content_edit_hor">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
@@ -485,6 +507,7 @@
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:textSize">13sp</item>
     </style>
+
     <style name="item_title_23_ver">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java
index 054bfa6..210db29 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingApplyActivity.java
@@ -245,15 +245,23 @@ public class MeetingApplyActivity extends BaseActivity {
         TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> {
             switch (i) {
                 case 1:
-                    mTvStartTime.setText(TimeUtils.date2String(date));
+                    String dayOfWeek = TimeUtils.getDayOfWeek(date);
+                    String s = TimeUtils.dateToStringMonthDayTime(date);
+                    String replace = s.replace(" ", " 周" + dayOfWeek + " \n");
+                    mTvStartTime.setText(replace);
+                    mTvStartTime.setTag(TimeUtils.date2String(date));
                     break;
                 case 2:
                     //判断时间大小
-                    String start = mTvStartTime.getText().toString().trim();
+                    String start = (String) mTvStartTime.getTag();
                     if (!TextUtils.isEmpty(start)) {
                         int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start));
                         if (span >= 0) {
-                            mTvEndTime.setText(TimeUtils.date2String(date));
+                            String endWeek = TimeUtils.getDayOfWeek(date);
+                            String endTime = TimeUtils.dateToStringMonthDayTime(date);
+                            String end = endTime.replace(" ", " 周" + endWeek + " \n");
+                            mTvEndTime.setText(end);
+                            mTvEndTime.setTag(TimeUtils.date2String(date));
                         } else {
                             ToastUtils.show("结束时间须大于开始时间");
                         }
@@ -521,8 +529,8 @@ public class MeetingApplyActivity extends BaseActivity {
         bean.setMeetingType(mSelType.getDataId());
         bean.setMeetingHostUserId(mSelEmcee.getUserId());
         bean.setMeetingHostUserName(mSelEmcee.getUserName());
-        bean.setMeetingStartTime(mTvStartTime.getText().toString().trim());
-        bean.setMeetingEndTime(mTvEndTime.getText().toString().trim());
+        bean.setMeetingStartTime((String) mTvStartTime.getTag());
+        bean.setMeetingEndTime((String) mTvEndTime.getTag());
         bean.setMeetingRoomId(mSelRoom.getRoomId());
         bean.setMeetingRoomName(mSelRoom.getRoomName());
         bean.setMeetingRoomType(mSelRoom.getRoomType());
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingCenterActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingCenterActivity.java
index 80f8524..f23bb13 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingCenterActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingCenterActivity.java
@@ -1,5 +1,6 @@
 package com.tenlionsoft.oamodule.activity.meeting;
 
+import android.content.Intent;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
@@ -28,6 +29,7 @@ import com.tenlionsoft.oamodule.R2;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
 import androidx.viewpager2.widget.ViewPager2;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -152,6 +154,16 @@ public class MeetingCenterActivity extends BaseActivity {
         mFragments.get(mVpContent.getCurrentItem()).refreshContentView(mKeywords);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable @org.jetbrains.annotations.Nullable Intent data) {
+        if (resultCode == RESULT_OK) {
+            if (requestCode == 12) {
+                doRefresh();
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     /**
      * 显示操作
      */
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java
index 1d3b4d4..38fc176 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/meeting/MeetingDetailActivity.java
@@ -28,6 +28,7 @@ import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
 import com.tenlionsoft.baselib.core.widget.views.QrDialog;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
 import com.tenlionsoft.baselib.utils.FileUtils;
+import com.tenlionsoft.baselib.utils.TimeUtils;
 import com.tenlionsoft.baselib.utils.UIUtil;
 import com.tenlionsoft.oamodule.R;
 import com.tenlionsoft.oamodule.R2;
@@ -159,14 +160,21 @@ public class MeetingDetailActivity extends BaseActivity {
         mTvName.setText(b.getMeetingTitle());
         mTvType.setText(b.getMeetingTypeName());
         mTvEmcee.setText(b.getMeetingHostUserName());
-        mTvStartTime.setText(b.getMeetingStartTime());
-        mTvEndTime.setText(b.getMeetingEndTime());
+        String startWeek = TimeUtils.getDayOfWeek(b.getMeetingStartTime());
+        String startTime = TimeUtils.dateToStringMonthDayTime(b.getMeetingStartTime());
+        String start = startTime.replace(" ", " 周" + startWeek + " \n");
+        mTvStartTime.setText(start);
+
+        String endWeek = TimeUtils.getDayOfWeek(b.getMeetingEndTime());
+        String endTime = TimeUtils.dateToStringMonthDayTime(b.getMeetingEndTime());
+        String end = endTime.replace(" ", " 周" + endWeek + " \n");
+        mTvEndTime.setText(end);
+
         mTvRoom.setText(b.getMeetingRoomName());
         if (!TextUtils.isEmpty(b.getMeetingNoticeType())) {
             if (b.getMeetingNoticeType().contains("1")) mCbNoticeMsg.setChecked(true);
             if (b.getMeetingNoticeType().contains("2")) mCbNoticeEmail.setChecked(true);
         }
-        //TODO 参会人员
         if (!TextUtils.isEmpty(b.getMeetingUserIds())) {
             //获取参会人员
             getMeetingAttachList();
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/oaflow/OaFlowCenterActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/oaflow/OaFlowCenterActivity.java
index 26bd93e..caf8d98 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/oaflow/OaFlowCenterActivity.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/oaflow/OaFlowCenterActivity.java
@@ -13,7 +13,6 @@ import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
 import android.text.Editable;
-import android.text.SpannableString;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.JavascriptInterface;
@@ -63,7 +62,10 @@ import com.tenlionsoft.baselib.utils.UserLgUtils;
 import com.tenlionsoft.oamodule.R;
 import com.tenlionsoft.oamodule.R2;
 import com.tenlionsoft.oamodule.adapter.OaFlowLogAdapter;
+import com.tenlionsoft.oamodule.beans.CarBean;
 import com.tenlionsoft.oamodule.beans.ChoosePersonListBean;
+import com.tenlionsoft.oamodule.beans.DriverBean;
+import com.tenlionsoft.oamodule.beans.MeetingRoomBean;
 import com.tenlionsoft.oamodule.beans.MineDoneBean;
 import com.tenlionsoft.oamodule.beans.MineReadBean;
 import com.tenlionsoft.oamodule.beans.MineTodoBean;
@@ -666,10 +668,37 @@ public class OaFlowCenterActivity extends BaseActivity {
                 //转交
                 ChoosePersonListBean bean = (ChoosePersonListBean) data.getSerializableExtra("bean");
                 doTransfer(bean);
+            } else if (requestCode == 15) {
+                //车辆
+                CarBean bean = (CarBean) data.getSerializableExtra("bean");
+                setSelectBeanToView(1, bean.getCarId(), bean.getCarName(), "");
+            } else if (requestCode == 16) {
+                //司机
+                DriverBean bean = (DriverBean) data.getSerializableExtra("bean");
+                setSelectBeanToView(2, bean.getDriverId(), bean.getDriverName(), "");
+            } else if (requestCode == 17) {
+                //会议室
+                MeetingRoomBean bean = (MeetingRoomBean) data.getSerializableExtra("bean");
+                setSelectBeanToView(3, bean.getRoomId(), bean.getRoomName(), bean.getRoomType());
             }
         }
     }
 
+    /**
+     * 填写选择的车辆1、司机2、会议室3
+     */
+    private void setSelectBeanToView(int type, String id, String name, String typeStr) {
+        if (type == 1) {
+            //车辆
+        } else if (type == 2) {
+            //司机
+
+        } else if (type == 3) {
+            //会议室  //roomType,roomId,roomName
+            mWebView.getJsAccessEntrace().quickCallJs("backMeetingRoom", typeStr, id, name);
+        }
+    }
+
     /**
      * 抄送
      */
@@ -970,8 +999,6 @@ public class OaFlowCenterActivity extends BaseActivity {
             mCsvFiles.setState(CustomStateView.STATE_SUCCESS);
             mFileBlueAdapter.setData(mFiles);
         }
-
-
     }
 
 
@@ -1103,6 +1130,21 @@ public class OaFlowCenterActivity extends BaseActivity {
                             .titleBar(mRlTitleBar)
                             .init();
                     }
+                } else if ("chooseDriver".equals(method)) {
+                    //选择司机
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_OA_ACTIVITY_SEL_DRIVER)
+                        .navigation(mActivity, 16);
+                } else if ("chooseMeetingRoom".equals(method)) {
+                    //选择会议室
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_OA_ACTIVITY_SEL_MEETING_ROOM)
+                        .navigation(mActivity, 17);
+                } else if ("chooseCar".equals(method)) {
+                    //选择车辆
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_OA_ACTIVITY_SEL_CAR)
+                        .navigation(mActivity, 15);
                 }
             });
         }
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineApplyAdapter.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineApplyAdapter.java
index 3900bed..4dc4385 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineApplyAdapter.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineApplyAdapter.java
@@ -1,11 +1,14 @@
 package com.tenlionsoft.oamodule.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.bumptech.glide.Glide;
 import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
+import com.tenlionsoft.baselib.utils.TimeUtils;
 import com.tenlionsoft.oamodule.R;
 import com.tenlionsoft.oamodule.beans.MeetingRoomRecordBean;
 import com.tenlionsoft.oamodule.holder.MeetingRoomRecordHolder;
@@ -32,10 +35,25 @@ public class MeetingMineApplyAdapter extends BaseRecyclerAdapter<MeetingRoomReco
     @Override
     public void bindHolder(MeetingRoomRecordHolder h, int i) {
         MeetingRoomRecordBean bean = mData.get(i);
-        h.mTvStartTime.setText(bean.getMeetingStartTime());
-//        h.mTvEndTime.setText("结束时间:"+bean.getMeetingEndTime());
-//        h.mTvName.setText("会议室:"+bean.getMeetingRoomName());
+        String start = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingStartTime());
+        String end = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingEndTime());
+        boolean b = TimeUtils.compareToCurrent(bean.getMeetingStartTime(), "yyyy-MM-dd HH:mm:ss");
+        Glide.with(mContext)
+            .load(b ? R.drawable.ic_meeting_state_on : R.drawable.ic_meeting_state_off)
+            .into(h.mIvMeetingHint);
+        h.mTvStartTime.setText(start + "-" + end);
         h.mTvTitle.setText(bean.getMeetingTitle());
-//        h.mTvEmcee.setText("主持人:"+bean.getMeetingHostUserName());
+        String meetingUserNames = bean.getMeetingUserNames();
+        if (!TextUtils.isEmpty(meetingUserNames)) {
+            String[] split = meetingUserNames.split(",");
+            h.mTvCount.setText(split.length + "人");
+        } else {
+            h.mTvCount.setVisibility(View.INVISIBLE);
+        }
+        if (i == (mData.size() - 1)) {
+            h.mLine.setVisibility(View.INVISIBLE);
+        } else {
+            h.mLine.setVisibility(View.VISIBLE);
+        }
     }
 }
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineJoinEmceeAdapter.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineJoinEmceeAdapter.java
index 47268b9..8de9bce 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineJoinEmceeAdapter.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingMineJoinEmceeAdapter.java
@@ -1,13 +1,15 @@
 package com.tenlionsoft.oamodule.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.bumptech.glide.Glide;
 import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
+import com.tenlionsoft.baselib.utils.TimeUtils;
 import com.tenlionsoft.oamodule.R;
-import com.tenlionsoft.oamodule.beans.MeetingRoomRecordBean;
 import com.tenlionsoft.oamodule.beans.MineJoinMeetingListBean;
 import com.tenlionsoft.oamodule.holder.MeetingRoomRecordHolder;
 
@@ -33,10 +35,25 @@ public class MeetingMineJoinEmceeAdapter extends BaseRecyclerAdapter<MineJoinMee
     @Override
     public void bindHolder(MeetingRoomRecordHolder h, int i) {
         MineJoinMeetingListBean.RowsBean bean = mData.get(i);
-        h.mTvStartTime.setText(bean.getMeetingDTO().getMeetingStartTime());
-//        h.mTvEndTime.setText("结束时间:"+bean.getMeetingDTO().getMeetingEndTime());
-//        h.mTvName.setText("会议室:"+bean.getMeetingDTO().getMeetingRoomName());
+        String start = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingDTO().getMeetingStartTime());
+        String end = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingDTO().getMeetingEndTime());
+        boolean b = TimeUtils.compareToCurrent(bean.getMeetingDTO().getMeetingStartTime(), "yyyy-MM-dd HH:mm:ss");
+        Glide.with(mContext)
+            .load(b ? R.drawable.ic_meeting_state_on : R.drawable.ic_meeting_state_off)
+            .into(h.mIvMeetingHint);
+        h.mTvStartTime.setText(start + "-" + end);
         h.mTvTitle.setText(bean.getMeetingDTO().getMeetingTitle());
-//        h.mTvEmcee.setText("主持人:"+bean.getMeetingDTO().getMeetingHostUserName());
+        String meetingUserNames = bean.getMeetingDTO().getMeetingUserNames();
+        if (!TextUtils.isEmpty(meetingUserNames)) {
+            String[] split = meetingUserNames.split(",");
+            h.mTvCount.setText(split.length + "人");
+        } else {
+            h.mTvCount.setVisibility(View.INVISIBLE);
+        }
+        if (i == (mData.size() - 1)) {
+            h.mLine.setVisibility(View.INVISIBLE);
+        } else {
+            h.mLine.setVisibility(View.VISIBLE);
+        }
     }
 }
diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/MeetingRoomRecordHolder.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/MeetingRoomRecordHolder.java
index 2cf19e3..e4ae63e 100644
--- a/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/MeetingRoomRecordHolder.java
+++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/holder/MeetingRoomRecordHolder.java
@@ -1,17 +1,17 @@
 package com.tenlionsoft.oamodule.holder;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.tenlionsoft.baselib.core.widget.base.BaseViewHolder;
+import com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView;
 import com.tenlionsoft.oamodule.R2;
 
 import org.jetbrains.annotations.NotNull;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 作者: adam
@@ -22,16 +22,14 @@ import butterknife.ButterKnife;
 public class MeetingRoomRecordHolder extends BaseViewHolder {
     @BindView(R2.id.tv_start_time)
     public TextView mTvStartTime;
-//    @BindView(R2.id.tv_end_time)
-//    public TextView mTvEndTime;
-//    @BindView(R2.id.tv_name)
-//    public TextView mTvName;
     @BindView(R2.id.tv_title)
     public TextView mTvTitle;
-//    @BindView(R2.id.tv_emcee)
-//    public TextView mTvEmcee;
-//    @BindView(R2.id.tv_state)
-//    public TextView mTvState;
+    @BindView(R2.id.tv_person_count)
+    public TypeFaceTextView mTvCount;
+    @BindView(R2.id.iv_meeting_hint)
+    public ImageView mIvMeetingHint;
+    @BindView(R2.id.line)
+    public View mLine;
 
     public MeetingRoomRecordHolder(@NonNull @NotNull View itemView) {
         super(itemView);
diff --git a/oamodule/src/main/res/layout/activity_meeting_apply.xml b/oamodule/src/main/res/layout/activity_meeting_apply.xml
index 8512786..eaa0bd6 100644
--- a/oamodule/src/main/res/layout/activity_meeting_apply.xml
+++ b/oamodule/src/main/res/layout/activity_meeting_apply.xml
@@ -18,7 +18,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/gray_f8"
             android:orientation="vertical">
 
 
@@ -26,18 +25,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingTop="10dp"
                 android:paddingBottom="10dp">
 
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议标题"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin"
+                    android:background="@color/gray_f8">
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceEditText
                         android:id="@+id/et_name"
@@ -45,118 +37,81 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:background="@null"
-                        android:gravity="right"
-                        android:hint="请输入会议标题"
+                        android:gravity="left"
+                        android:hint="会议标题"
+                        android:minLines="2"
+                        android:padding="5dp"
                         android:textColor="@color/text_80_gray"
                         android:textSize="14sp" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议类型"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_type"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:drawableRight="@drawable/ic_arrow_right_24"
-                        android:drawablePadding="5dp"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="请选择会议类型"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="主持人"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_emcee"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:drawableRight="@drawable/ic_arrow_right_24"
-                        android:drawablePadding="5dp"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="请选择会议主持人"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="开始时间"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_start_time"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:drawableRight="@drawable/ic_arrow_right_24"
-                        android:drawablePadding="5dp"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="请选择会议开始时间"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="结束时间"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_end_time"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:drawableRight="@drawable/ic_arrow_right_24"
-                        android:drawablePadding="5dp"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="请选择会议结束时间"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center">
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:id="@+id/tv_start_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:gravity="left|center_vertical"
+                            android:hint="开始时间"
+                            android:minHeight="50dp"
+                            android:textColor="@color/text_80_gray"
+                            android:textSize="14sp" />
+                    </LinearLayout>
+
+
+                    <ImageView
+                        android:layout_width="2dp"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ic_line_hor_gray" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center">
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:id="@+id/tv_end_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:gravity="left|center_vertical"
+                            android:hint="结束时间"
+                            android:minHeight="50dp"
+                            android:textColor="@color/text_80_gray"
+                            android:textSize="14sp" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_room_icon" />
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
                         android:text="会议室"
                         android:textColor="@color/black_10"
                         android:textSize="14sp" />
@@ -176,12 +131,146 @@
                         android:textSize="14sp" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_hor_content">
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_emcee_icon" />
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:text="主持人"
+                        android:textColor="@color/black_10"
+                        android:textSize="14sp" />
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:id="@+id/tv_emcee"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:clickable="true"
+                        android:drawableRight="@drawable/ic_arrow_right_24"
+                        android:drawablePadding="5dp"
+                        android:focusable="true"
+                        android:gravity="right"
+                        android:hint="请选择会议主持人"
+                        android:textColor="@color/text_80_gray"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/gray_f8"
+                    android:orientation="vertical"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="10dp">
+
+                    <LinearLayout style="@style/item_ver">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:layout_width="17dp"
+                                android:layout_height="17dp"
+                                android:src="@drawable/ic_meeting_join_icon" />
+
+                            <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginLeft="5dp"
+                                android:text="参会人员"
+                                android:textColor="@color/black_10"
+                                android:textSize="14sp" />
+                        </LinearLayout>
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:background="@drawable/shp_rectangle_gray_df">
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/rlv_join"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintHeight_default="wrap"
+                                app:layout_constraintHeight_max="200dp"
+                                app:layout_constraintLeft_toLeftOf="parent"
+                                app:layout_constraintRight_toRightOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                tools:itemCount="1"
+                                tools:layoutManager="GridLayoutManager"
+                                tools:listitem="@layout/item_person_base_show"
+                                tools:spanCount="5" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_type_icon" />
+
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:text="会议类型"
+                        android:textColor="@color/black_10"
+                        android:textSize="14sp" />
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:id="@+id/tv_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:clickable="true"
+                        android:drawableRight="@drawable/ic_arrow_right_24"
+                        android:drawablePadding="5dp"
+                        android:focusable="true"
+                        android:gravity="right"
+                        android:hint="请选择会议类型"
+                        android:textColor="@color/text_80_gray"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_notice_icon" />
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
                         android:text="通知方式"
                         android:textColor="@color/black_10"
                         android:textSize="14sp" />
@@ -218,73 +307,44 @@
                             android:textColor="@color/col_blue_gray" />
                     </LinearLayout>
                 </LinearLayout>
-
             </LinearLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
+                android:background="@color/gray_f8"
                 android:orientation="vertical"
                 android:paddingTop="5dp"
                 android:paddingBottom="10dp">
 
                 <LinearLayout style="@style/item_ver">
 
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="参会人员"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/shp_rectangle_gray_df">
-
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/rlv_join"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintHeight_default="wrap"
-                            app:layout_constraintHeight_max="200dp"
-                            app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintRight_toRightOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:itemCount="1"
-                            tools:layoutManager="GridLayoutManager"
-                            tools:listitem="@layout/item_person_base_show"
-                            tools:spanCount="5" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:orientation="vertical"
-                android:paddingTop="5dp"
-                android:paddingBottom="10dp">
-
-                <LinearLayout style="@style/item_ver">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议内容"
-                        android:textColor="@color/black_10"
-                        android:textSize="14sp" />
-
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="17dp"
+                            android:layout_height="17dp"
+                            android:src="@drawable/ic_meeting_content_icon" />
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="5dp"
+                            android:text="会议内容"
+                            android:textColor="@color/black_10"
+                            android:textSize="14sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
                         android:background="@drawable/shp_rectangle_gray_df"
                         android:orientation="vertical">
 
@@ -317,24 +377,38 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
+                android:background="@color/gray_f8"
                 android:orientation="vertical"
                 android:paddingTop="5dp"
                 android:paddingBottom="10dp">
 
                 <LinearLayout style="@style/item_ver">
 
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议文件"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="17dp"
+                            android:layout_height="17dp"
+                            android:src="@drawable/ic_save_draft" />
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="5dp"
+                            android:text="会议文件"
+                            android:textColor="@color/black_10"
+                            android:textSize="14sp" />
+
+                    </LinearLayout>
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
+                        android:layout_marginTop="10dp"
                         android:background="@drawable/shp_rectangle_gray_df"
                         android:orientation="vertical">
 
diff --git a/oamodule/src/main/res/layout/activity_meeting_detail.xml b/oamodule/src/main/res/layout/activity_meeting_detail.xml
index 73682c2..106429f 100644
--- a/oamodule/src/main/res/layout/activity_meeting_detail.xml
+++ b/oamodule/src/main/res/layout/activity_meeting_detail.xml
@@ -11,33 +11,25 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="5dp"
         android:scrollbars="none">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/gray_f8"
             android:orientation="vertical">
 
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
                 android:orientation="vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="5dp"
                 android:paddingBottom="10dp">
 
-                <LinearLayout style="@style/item_hor_content">
 
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议标题"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin"
+                    android:background="@color/gray_f8">
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
                         android:id="@+id/tv_name"
@@ -45,20 +37,224 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:background="@null"
+                        android:hint="会议标题"
+                        android:minLines="2"
+                        android:padding="5dp"
+                        android:textColor="@color/text_80_gray"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center">
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:id="@+id/tv_start_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:gravity="left|center_vertical"
+                            android:hint="开始时间"
+                            android:minHeight="50dp"
+                            android:textColor="@color/text_80_gray"
+                            android:textSize="14sp" />
+                    </LinearLayout>
+
+
+                    <ImageView
+                        android:layout_width="2dp"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ic_line_hor_gray" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center">
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:id="@+id/tv_end_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:gravity="left|center_vertical"
+                            android:hint="结束时间"
+                            android:minHeight="50dp"
+                            android:textColor="@color/text_80_gray"
+                            android:textSize="14sp" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_room_icon" />
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:text="会议室"
+                        android:textColor="@color/black_10"
+                        android:textSize="14sp" />
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:id="@+id/tv_room"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:clickable="true"
+                        android:drawablePadding="5dp"
+                        android:focusable="true"
                         android:gravity="right"
                         android:hint="未录入"
                         android:textColor="@color/text_80_gray"
                         android:textSize="14sp" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_hor_content">
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_emcee_icon" />
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:text="主持人"
+                        android:textColor="@color/black_10"
+                        android:textSize="14sp" />
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:id="@+id/tv_emcee"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:clickable="true"
+                        android:drawablePadding="5dp"
+                        android:focusable="true"
+                        android:gravity="right"
+                        android:hint="未录入"
+                        android:textColor="@color/text_80_gray"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/gray_f8"
+                    android:orientation="vertical"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="10dp">
+
+                    <LinearLayout style="@style/item_ver">
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:layout_width="17dp"
+                                    android:layout_height="17dp"
+                                    android:src="@drawable/ic_meeting_join_icon" />
+
+                                <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginLeft="5dp"
+                                    android:text="参会人员"
+                                    android:textColor="@color/black_10"
+                                    android:textSize="14sp" />
+                            </LinearLayout>
+
+                            <Button
+                                android:id="@+id/btn_qr"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:background="@drawable/sel_btn_submit_no_size"
+                                android:minWidth="0dp"
+                                android:minHeight="0dp"
+                                android:padding="5dp"
+                                android:text="签到码"
+                                android:textColor="@color/col_white_gray_press"
+                                android:textSize="@dimen/text_14" />
+                        </RelativeLayout>
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="10dp"
+                            android:background="@drawable/shp_rectangle_gray_df">
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/rlv_join"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:padding="5dp"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintHeight_default="wrap"
+                                app:layout_constraintHeight_max="200dp"
+                                app:layout_constraintLeft_toLeftOf="parent"
+                                app:layout_constraintRight_toRightOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                tools:itemCount="50"
+                                tools:layoutManager="GridLayoutManager"
+                                tools:listitem="@layout/item_person_base_show"
+                                tools:spanCount="4" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_type_icon" />
+
+
+                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
                         android:text="会议类型"
-                        android:textColor="@color/black"
+                        android:textColor="@color/black_10"
                         android:textSize="14sp" />
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
@@ -74,106 +270,24 @@
                         android:textSize="14sp" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="主持人"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_emcee"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="未录入"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="开始时间"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_start_time"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="未录入"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="结束时间"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_end_time"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="未录入"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议室"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:id="@+id/tv_room"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="right"
-                        android:hint="未录入"
-                        android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_hor_content">
+
+                <LinearLayout
+                    style="@style/item_hor_content_no_margin_padding"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/gray_f8">
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="17dp"
+                        android:src="@drawable/ic_meeting_notice_icon" />
 
                     <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
                         android:text="通知方式"
-                        android:textColor="@color/black"
+                        android:textColor="@color/black_10"
                         android:textSize="14sp" />
 
                     <LinearLayout
@@ -213,93 +327,42 @@
 
             </LinearLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:background="@color/white"
+                android:background="@color/gray_f8"
                 android:orientation="vertical"
                 android:paddingTop="5dp"
                 android:paddingBottom="10dp">
 
                 <LinearLayout style="@style/item_ver">
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_gravity="center_vertical"
-                            android:text="参会人员"
-                            android:textColor="@color/black"
-                            android:textSize="14sp" />
-
-                        <Button
-                            android:id="@+id/btn_qr"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:background="@drawable/sel_btn_submit_no_size"
-                            android:minWidth="0dp"
-                            android:minHeight="0dp"
-                            android:padding="5dp"
-                            android:text="签到码"
-                            android:textColor="@color/col_white_gray_press"
-                            android:textSize="@dimen/text_14" />
-                    </RelativeLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:background="@drawable/shp_rectangle_gray_df">
-
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/rlv_join"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:padding="5dp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintHeight_default="wrap"
-                            app:layout_constraintHeight_max="200dp"
-                            app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintRight_toRightOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:itemCount="50"
-                            tools:layoutManager="GridLayoutManager"
-                            tools:listitem="@layout/item_person_base_show"
-                            tools:spanCount="4" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:paddingTop="5dp"
-                android:paddingBottom="10dp">
-
-                <LinearLayout style="@style/item_ver">
-
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议内容"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
-
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="17dp"
+                            android:layout_height="17dp"
+                            android:src="@drawable/ic_meeting_content_icon" />
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="5dp"
+                            android:text="会议内容"
+                            android:textColor="@color/black_10"
+                            android:textSize="14sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
                         android:background="@drawable/shp_rectangle_gray_df"
                         android:orientation="vertical">
 
@@ -315,33 +378,48 @@
                             android:padding="5dp"
                             android:textColor="@color/black"
                             android:textSize="14sp" />
+
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
-                android:background="@color/white"
+                android:background="@color/gray_f8"
                 android:orientation="vertical"
                 android:paddingTop="5dp"
                 android:paddingBottom="10dp">
 
                 <LinearLayout style="@style/item_ver">
 
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="会议文件"
-                        android:textColor="@color/black"
-                        android:textSize="14sp" />
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="17dp"
+                            android:layout_height="17dp"
+                            android:src="@drawable/ic_save_draft" />
+
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="5dp"
+                            android:text="会议文件"
+                            android:textColor="@color/black_10"
+                            android:textSize="14sp" />
+
+                    </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
+                        android:layout_marginTop="10dp"
                         android:background="@drawable/shp_rectangle_gray_df"
                         android:orientation="vertical">
 
diff --git a/oamodule/src/main/res/layout/item_meeting_room_record.xml b/oamodule/src/main/res/layout/item_meeting_room_record.xml
index fdafc98..4653a95 100644
--- a/oamodule/src/main/res/layout/item_meeting_room_record.xml
+++ b/oamodule/src/main/res/layout/item_meeting_room_record.xml
@@ -7,77 +7,71 @@
     android:layout_marginStart="17dp"
     android:layout_marginTop="10dp"
     android:layout_marginBottom="10dp"
-    android:orientation="vertical">
+    android:orientation="horizontal">
 
-    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-        android:id="@+id/tv_title"
+    <ImageView
+        android:id="@+id/iv_meeting_hint"
+        android:layout_width="31dp"
+        android:layout_height="31dp"
+        android:src="@drawable/ic_meeting_state_on" />
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_16"
-        app:text_type_cus="2"
-        tools:text="会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容" />
+        android:layout_marginLeft="14dp"
+        android:orientation="vertical">
 
-    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-        android:id="@+id/tv_start_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:textSize="14sp"
-        tools:text="2022-22-22 12:12:12" />
+        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/black"
+            android:textSize="@dimen/text_16"
+            app:text_type_cus="2"
+            tools:text="会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容" />
 
-    <!--    <LinearLayout-->
-    <!--        android:layout_width="0dp"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_weight="1"-->
-    <!--        android:orientation="vertical">-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
+            <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                android:id="@+id/tv_start_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:textColor="#89000000"
+                android:textSize="12sp"
+                tools:text="2022-22-22 12:12:12" />
 
-    <!--        <LinearLayout-->
-    <!--            android:layout_width="match_parent"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:orientation="vertical">-->
+            <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:text="  |  "
+                android:textColor="#89000000"
+                android:textSize="10sp" />
 
+            <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                android:id="@+id/tv_person_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:textColor="#89000000"
+                android:textSize="12sp"
+                tools:text="100人" />
+        </LinearLayout>
 
-    <!--            <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
-    <!--                android:id="@+id/tv_end_time"-->
-    <!--                android:layout_width="wrap_content"-->
-    <!--                android:layout_height="wrap_content"-->
-    <!--                android:textColor="@color/black"-->
-    <!--                android:textSize="14sp"-->
-    <!--                android:textStyle="bold"-->
-    <!--                tools:text="2022-22-22 12:12:12" />-->
-    <!--        </LinearLayout>-->
-
-    <!--        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
-    <!--            android:id="@+id/tv_name"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            tools:text="会议室名称" />-->
-
-    <!--        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
-    <!--            android:id="@+id/tv_title"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            tools:text="会议标题" />-->
-
-    <!--        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
-    <!--            android:id="@+id/tv_emcee"-->
-    <!--            android:layout_width="match_parent"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            tools:text="主持人" />-->
-    <!--    </LinearLayout>-->
-
-    <!--    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
-    <!--        android:id="@+id/tv_state"-->
-    <!--        android:layout_width="wrap_content"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:background="@drawable/shp_status_blue"-->
-    <!--        android:gravity="center"-->
-    <!--        android:textColor="@color/text_blue"-->
-    <!--        tools:text="状态" />-->
-
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginRight="10dp"
+            android:background="#F9F9F9" />
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file