会议管理页面修改、流程发布添加原生选择会议室

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();
+    public static final String TAG = BaseJsAccessEntrace.class.getSimpleName();
-    BaseJsAccessEntrace(WebView webView){
+
-        this.mWebView=webView;
+    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();
+        StringBuilder sb = new StringBuilder();
-        sb.append("javascript:"+method);
+        sb.append("javascript:" + method);
-        if(params==null||params.length==0){
+        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){
+    private String concat(String... params) {
-        StringBuilder mStringBuilder=new StringBuilder();
+        StringBuilder mStringBuilder = new StringBuilder();
-        for(int i=0;i<params.length;i++){
+        for (int i = 0; i < params.length; i++) {
-            String param=params[i];
+            String param = params[i];
-            if(!AgentWebUtils.isJson(param)){
+            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);
     }
 }

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://192.168.0.120:8080/";/* 测试IP */
-    public static final String IP = "http://121.36.71.250/";/* 测试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/";/*人口系统*/

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());

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) {

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>

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>

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.setMeetingStartTime((String) mTvStartTime.getTag());
-        bean.setMeetingEndTime(mTvEndTime.getText().toString().trim());
+        bean.setMeetingEndTime((String) mTvEndTime.getTag());
         bean.setMeetingRoomId(mSelRoom.getRoomId());
         bean.setMeetingRoomName(mSelRoom.getRoomName());
         bean.setMeetingRoomType(mSelRoom.getRoomType());

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);
+    }
+
     /**
      * 显示操作
      */

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());
+        String startWeek = TimeUtils.getDayOfWeek(b.getMeetingStartTime());
-        mTvEndTime.setText(b.getMeetingEndTime());
+        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();

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);
                 }
             });
         }

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());
+        String start = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingStartTime());
-//        h.mTvEndTime.setText("结束时间:"+bean.getMeetingEndTime());
+        String end = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingEndTime());
-//        h.mTvName.setText("会议室:"+bean.getMeetingRoomName());
+        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);
+        }
     }
 }

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());
+        String start = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingDTO().getMeetingStartTime());
-//        h.mTvEndTime.setText("结束时间:"+bean.getMeetingDTO().getMeetingEndTime());
+        String end = TimeUtils.dateToStringMonthDayTimeChinese(bean.getMeetingDTO().getMeetingEndTime());
-//        h.mTvName.setText("会议室:"+bean.getMeetingDTO().getMeetingRoomName());
+        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);
+        }
     }
 }

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)
+    @BindView(R2.id.tv_person_count)
-//    public TextView mTvEmcee;
+    public TypeFaceTextView mTvCount;
-//    @BindView(R2.id.tv_state)
+    @BindView(R2.id.iv_meeting_hint)
-//    public TextView mTvState;
+    public ImageView mIvMeetingHint;
+    @BindView(R2.id.line)
+    public View mLine;
 
     public MeetingRoomRecordHolder(@NonNull @NotNull View itemView) {
         super(itemView);

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">
+                <LinearLayout
-
+                    style="@style/item_hor_content_no_margin"
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                    android:background="@color/gray_f8">
-                        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.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:gravity="left"
-                        android:hint="请输入会议标题"
+                        android:hint="会议标题"
+                        android:minLines="2"
+                        android:padding="5dp"
                         android:textColor="@color/text_80_gray"
                         android:textSize="14sp" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_hor_content">
+                <LinearLayout
-
+                    style="@style/item_hor_content_no_margin"
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                    android:layout_marginTop="5dp"
-                        android:layout_width="wrap_content"
+                    android:background="@color/gray_f8">
-                        android:layout_height="wrap_content"
+
-                        android:layout_gravity="center_vertical"
+                    <LinearLayout
-                        android:text="会议类型"
+                        android:layout_width="0dp"
-                        android:textColor="@color/black_10"
+                        android:layout_height="wrap_content"
-                        android:textSize="14sp" />
+                        android:layout_weight="1"
-
+                        android:gravity="center">
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+
-                        android:id="@+id/tv_type"
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_width="match_parent"
+                            android:id="@+id/tv_start_time"
-                        android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
-                        android:layout_gravity="center_vertical"
+                            android:layout_height="wrap_content"
-                        android:clickable="true"
+                            android:clickable="true"
-                        android:drawableRight="@drawable/ic_arrow_right_24"
+                            android:focusable="true"
-                        android:drawablePadding="5dp"
+                            android:gravity="left|center_vertical"
-                        android:focusable="true"
+                            android:hint="开始时间"
-                        android:gravity="right"
+                            android:minHeight="50dp"
-                        android:hint="请选择会议类型"
+                            android:textColor="@color/text_80_gray"
-                        android:textColor="@color/text_80_gray"
+                            android:textSize="14sp" />
-                        android:textSize="14sp" />
+                    </LinearLayout>
-                </LinearLayout>
+
-
+
-                <LinearLayout style="@style/item_hor_content">
+                    <ImageView
-
+                        android:layout_width="2dp"
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:layout_height="30dp"
-                        android:layout_width="wrap_content"
+                        android:layout_gravity="center_vertical"
-                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_line_hor_gray" />
-                        android:layout_gravity="center_vertical"
+
-                        android:text="主持人"
+                    <LinearLayout
-                        android:textColor="@color/black_10"
+                        android:layout_width="0dp"
-                        android:textSize="14sp" />
+                        android:layout_height="wrap_content"
-
+                        android:layout_weight="1"
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:gravity="center">
-                        android:id="@+id/tv_emcee"
+
-                        android:layout_width="match_parent"
+                        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-                        android:layout_height="wrap_content"
+                            android:id="@+id/tv_end_time"
-                        android:layout_gravity="center_vertical"
+                            android:layout_width="wrap_content"
-                        android:clickable="true"
+                            android:layout_height="wrap_content"
-                        android:drawableRight="@drawable/ic_arrow_right_24"
+                            android:clickable="true"
-                        android:drawablePadding="5dp"
+                            android:focusable="true"
-                        android:focusable="true"
+                            android:gravity="left|center_vertical"
-                        android:gravity="right"
+                            android:hint="结束时间"
-                        android:hint="请选择会议主持人"
+                            android:minHeight="50dp"
-                        android:textColor="@color/text_80_gray"
+                            android:textColor="@color/text_80_gray"
-                        android:textSize="14sp" />
+                            android:textSize="14sp" />
-                </LinearLayout>
+                    </LinearLayout>
-
+
-                <LinearLayout style="@style/item_hor_content">
+                </LinearLayout>
-
+
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                <LinearLayout
-                        android:layout_width="wrap_content"
+                    style="@style/item_hor_content_no_margin_padding"
-                        android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
-                        android:layout_gravity="center_vertical"
+                    android:background="@color/gray_f8">
-                        android:text="开始时间"
+
-                        android:textColor="@color/black_10"
+                    <ImageView
-                        android:textSize="14sp" />
+                        android:layout_width="17dp"
-
+                        android:layout_height="17dp"
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                        android:src="@drawable/ic_meeting_room_icon" />
-                        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">
 
                     <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
+                    <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
+                        android:orientation="horizontal">
-                        android:text="会议文件"
+
-                        android:textColor="@color/black"
+                        <ImageView
-                        android:textSize="14sp" />
+                            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">
 

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
+                <LinearLayout
-                        android:layout_width="wrap_content"
+                    style="@style/item_hor_content_no_margin"
-                        android:layout_height="wrap_content"
+                    android:background="@color/gray_f8">
-                        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_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">
+
-
+                <LinearLayout
-                    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+                    style="@style/item_hor_content_no_margin_padding"
-                        android:layout_width="wrap_content"
+                    android:layout_marginTop="5dp"
-                        android:layout_height="wrap_content"
+                    android:background="@color/gray_f8">
-                        android:layout_gravity="center_vertical"
+
-                        android:text="主持人"
+                    <ImageView
-                        android:textColor="@color/black"
+                        android:layout_width="17dp"
-                        android:textSize="14sp" />
+                        android:layout_height="17dp"
-
+                        android:src="@drawable/ic_meeting_notice_icon" />
-                    <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">
 
                     <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/gray_f8"
-                android:background="@color/white"
                 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
+                    <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
+                        android:orientation="horizontal">
-                        android:text="会议文件"
+
-                        android:textColor="@color/black"
+                        <ImageView
-                        android:textSize="14sp" />
+                            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">
 

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
+    <ImageView
-        android:id="@+id/tv_title"
+        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:layout_marginLeft="14dp"
-        android:maxLines="1"
+        android:orientation="vertical">
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_16"
-        app:text_type_cus="2"
-        tools:text="会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容" />
 
-    <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
+        <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-        android:id="@+id/tv_start_time"
+            android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
+            android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+            android:ellipsize="end"
-        android:textSize="14sp"
+            android:maxLines="1"
-        tools:text="2022-22-22 12:12:12" />
+            android:textColor="@color/black"
+            android:textSize="@dimen/text_16"
+            app:text_type_cus="2"
+            tools:text="会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容会议内容" />
 
-    <!--    <LinearLayout-->
+        <LinearLayout
-    <!--        android:layout_width="0dp"-->
+            android:layout_width="match_parent"
-    <!--        android:layout_height="wrap_content"-->
+            android:layout_height="wrap_content"
-    <!--        android:layout_weight="1"-->
+            android:gravity="center_vertical"
-    <!--        android:orientation="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-->
+            <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
-    <!--            android:layout_width="match_parent"-->
+                android:layout_width="wrap_content"
-    <!--            android:layout_height="wrap_content"-->
+                android:layout_height="wrap_content"
-    <!--            android:orientation="vertical">-->
+                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-->
+        <View
-    <!--                android:id="@+id/tv_end_time"-->
+            android:id="@+id/line"
-    <!--                android:layout_width="wrap_content"-->
+            android:layout_width="match_parent"
-    <!--                android:layout_height="wrap_content"-->
+            android:layout_height="1dp"
-    <!--                android:textColor="@color/black"-->
+            android:layout_marginTop="14dp"
-    <!--                android:textSize="14sp"-->
+            android:layout_marginRight="10dp"
-    <!--                android:textStyle="bold"-->
+            android:background="#F9F9F9" />
-    <!--                tools:text="2022-22-22 12:12:12" />-->
+    </LinearLayout>
-    <!--        </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="状态" />-->
-
 
 </LinearLayout>