gaojian/oasystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平板页面适配

Browse Source
This commit is contained in:
itgaojian 2023-02-28 16:15:50 +08:00
parent 0274bb9e9a
commit 3462845a22
17 changed files with 1630 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
View File

@ -56,7 +56,7 @@ public class PathConfig {
public static final String SECRET = "CMXX_TOKEN_INFOS";//秘钥 public static final String SECRET = "CMXX_TOKEN_INFOS";//秘钥
public static final String SOCKET_MSG_SECRET = "SocKEtsEcReT_KeY";//消息秘钥 public static final String SOCKET_MSG_SECRET = "SocKEtsEcReT_KeY";//消息秘钥
public static final String PROJECT_NAME = "city-governance";/* ===项目名称==*/ public static final String PROJECT_NAME = "city-governance";/* ===项目名称==*/
public static final String PROJECT_NAME_CH = "市域治理"; public static final String PROJECT_NAME_CH = "综合办公系统";
public static final String USER_TYPE_LEADER = "b01dac8e-c516-4974-b513-f1352ca40202"; public static final String USER_TYPE_LEADER = "b01dac8e-c516-4974-b513-f1352ca40202";

39
baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java
View File

@ -1,5 +1,7 @@
package com.tenlionsoft.baselib.core.network.update.utils; package com.tenlionsoft.baselib.core.network.update.utils;
import static android.app.Notification.VISIBILITY_SECRET;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
@ -8,12 +10,10 @@ import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build; import android.os.Build;
import com.tenlionsoft.baselib.R;
import com.tenlionsoft.baselib.core.network.update.service.DownloadService;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import static android.app.Notification.VISIBILITY_SECRET; import com.tenlionsoft.baselib.R;
import com.tenlionsoft.baselib.core.network.update.service.DownloadService;
public class NotificationHelper { public class NotificationHelper {
@ -28,7 +28,8 @@ public class NotificationHelper {
public NotificationHelper(Context context) { public NotificationHelper(Context context) {
this.mContext = context; this.mContext = context;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT); NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME,
NotificationManager.IMPORTANCE_DEFAULT);
channel.canBypassDnd(); channel.canBypassDnd();
channel.enableLights(true); channel.enableLights(true);
channel.setLockscreenVisibility(VISIBILITY_SECRET); channel.setLockscreenVisibility(VISIBILITY_SECRET);
@ -51,9 +52,10 @@ public class NotificationHelper {
Intent myIntent = new Intent(mContext, DownloadService.class); Intent myIntent = new Intent(mContext, DownloadService.class);
myIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); myIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
myIntent.putExtra(Constants.APK_DOWNLOAD_URL, apkUrl); myIntent.putExtra(Constants.APK_DOWNLOAD_URL, apkUrl);
PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, myIntent, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, myIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
NotificationCompat.Builder builder = getNofity(content) NotificationCompat.Builder builder = getNofity(content)
.setContentIntent(pendingIntent); .setContentIntent(pendingIntent);
getManager().notify(notification_id, builder.build()); getManager().notify(notification_id, builder.build());
} }
@ -62,24 +64,25 @@ public class NotificationHelper {
*/ */
public void updateProgress(int progress) { public void updateProgress(int progress) {
String text = mContext.getString(R.string.android_auto_update_download_progress, progress); String text = mContext.getString(R.string.android_auto_update_download_progress, progress);
PendingIntent pendingintent = PendingIntent.getActivity(mContext, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent pendingintent = PendingIntent.getActivity(mContext, 0, new Intent(),
PendingIntent.FLAG_UPDATE_CURRENT);
NotificationCompat.Builder builder = getNofity(text) NotificationCompat.Builder builder = getNofity(text)
.setProgress(100, progress, false) .setProgress(100, progress, false)
.setContentIntent(pendingintent); .setContentIntent(pendingintent);
getManager().notify(notification_id, builder.build()); getManager().notify(notification_id, builder.build());
} }
private NotificationCompat.Builder getNofity(String text) { private NotificationCompat.Builder getNofity(String text) {
return new NotificationCompat.Builder(mContext.getApplicationContext(), CHANNEL_ID) return new NotificationCompat.Builder(mContext.getApplicationContext(), CHANNEL_ID)
.setTicker(mContext.getString(R.string.android_auto_update_notify_ticker)) .setTicker(mContext.getString(R.string.android_auto_update_notify_ticker))
.setContentTitle("市域治理") .setContentTitle(mContext.getResources().getString(R.string.default_channel))
.setContentText(text) .setContentText(text)
.setSmallIcon(R.drawable.app_logo_small) .setSmallIcon(R.drawable.app_logo_small)
.setAutoCancel(true) .setAutoCancel(true)
.setOnlyAlertOnce(true) .setOnlyAlertOnce(true)
.setWhen(System.currentTimeMillis()) .setWhen(System.currentTimeMillis())
.setPriority(NotificationCompat.PRIORITY_HIGH); .setPriority(NotificationCompat.PRIORITY_HIGH);
} }

11
baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java
View File

@ -20,16 +20,16 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.hjq.toast.ToastUtils;
import com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tenlionsoft.baselib.R;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts; import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.hjq.toast.ToastUtils;
import com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tenlionsoft.baselib.R;
public abstract class BaseFragment extends Fragment { public abstract class BaseFragment extends Fragment {
public static final int STATE_LOAD = 1234;//加载中 public static final int STATE_LOAD = 1234;//加载中
public static final int STATE_ERROR = 1235;//加载失败 public static final int STATE_ERROR = 1235;//加载失败
@ -86,6 +86,7 @@ public abstract class BaseFragment extends Fragment {
setTitleView(false); setTitleView(false);
setStateView(STATE_LOAD); setStateView(STATE_LOAD);
setDataToView(mDataView); setDataToView(mDataView);
setTouchDelegate(mIvFragmentBack, 30);
return contentView; return contentView;
} }

2
baselib/src/main/res/values/strings.xml
View File

@ -30,7 +30,7 @@
<string name="android_auto_update_download_progress">正在下载:%1$d%%</string> <string name="android_auto_update_download_progress">正在下载:%1$d%%</string>
<string name="android_auto_update_dialog_checking">正在检查版本</string> <string name="android_auto_update_dialog_checking">正在检查版本</string>
<string name="default_channel">市域治理</string> <string name="default_channel">综合办公系统</string>
<string name="uninput">未录入</string> <string name="uninput">未录入</string>
<string name="limit_id_card">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string> <string name="limit_id_card">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
<string name="limit_phone">0123456789</string> <string name="limit_phone">0123456789</string>

4
build.gradle
View File

@ -59,8 +59,8 @@ ext {
gCompileSdkVersion = 30 gCompileSdkVersion = 30
gMinSdkVersion = 19 gMinSdkVersion = 19
gTargetSdkVersion = 30 gTargetSdkVersion = 30
gVersionCode = 5 gVersionCode = 6
gVersionName = '1.0.5' gVersionName = '1.0.6'
gBuildToolsVersion = "29.0.2" gBuildToolsVersion = "29.0.2"
// gVersionCode=26 // gVersionCode=26
// gVersionName='1.3.0' // gVersionName='1.3.0'

16
oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingTimeAdapter.java
View File

@ -6,6 +6,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.TimeUtils;
import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.beans.MineJoinMeetingListBean; import com.tenlionsoft.oamodule.beans.MineJoinMeetingListBean;
@ -20,13 +21,24 @@ import java.util.List;
* 描述: * 描述:
*/ */
public class MeetingTimeAdapter extends BaseRecyclerAdapter<MineJoinMeetingListBean.RowsBean, MeetingTimeHolder> { public class MeetingTimeAdapter extends BaseRecyclerAdapter<MineJoinMeetingListBean.RowsBean, MeetingTimeHolder> {
public MeetingTimeAdapter(Context ctx, List<MineJoinMeetingListBean.RowsBean> list) { private int mScreen = 2;//2 竖屏 1 横屏
public MeetingTimeAdapter(Context ctx, List<MineJoinMeetingListBean.RowsBean> list, int type) {
super(ctx, list); super(ctx, list);
this.mScreen = type;
} }
@Override @Override
public MeetingTimeHolder createHolder(ViewGroup parent, int viewType) { public MeetingTimeHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_meeting_time, parent, false); View itemView;
if (mScreen == 1) {
//横屏
itemView = LayoutInflater.from(mContext).inflate(R.layout.item_meeting_time, parent, false);
} else {
//竖屏
itemView = LayoutInflater.from(mContext).inflate(R.layout.item_meeting_time_p, parent, false);
}
LogUtils.e("屏幕切换");
return new MeetingTimeHolder(itemView); return new MeetingTimeHolder(itemView);
} }

12
oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/ScheduleAdapter.java
View File

@ -38,9 +38,15 @@ public class ScheduleAdapter extends BaseRecyclerAdapter<ScheduleDetailBean, Sch
h.mTvInterval.setText("已提醒"); h.mTvInterval.setText("已提醒");
h.mIvHintIcon.setImageResource(R.drawable.ic_schedule_hint_icon_red); h.mIvHintIcon.setImageResource(R.drawable.ic_schedule_hint_icon_red);
} else { } else {
String fitTimeSpanByNow = TimeUtils.getFitTimeSpanByNow(b.getScheduleStart() + " " + b.getScheduleStartTime(), 3); boolean compare = TimeUtils.compare(TimeUtils.getCurrentDate(), b.getScheduleStart());
h.mTvInterval.setText(fitTimeSpanByNow + "后"); if (compare) {
h.mIvHintIcon.setImageResource(R.drawable.ic_schedule_hint_icon_gray); String fitTimeSpanByNow = TimeUtils.getFitTimeSpanByNow(b.getScheduleStart() + " " + b.getScheduleStartTime(), 3);
h.mTvInterval.setText(fitTimeSpanByNow + "后");
h.mIvHintIcon.setImageResource(R.drawable.ic_schedule_hint_icon_gray);
} else {
h.mTvInterval.setText("提醒超时");
h.mIvHintIcon.setImageResource(R.drawable.ic_schedule_hint_icon_red);
}
} }
h.mTvContent.setText(mData.get(i).getScheduleTitle()); h.mTvContent.setText(mData.get(i).getScheduleTitle());
h.mTvStart.setText(mData.get(i).getScheduleStart() + " " + mData.get(i).getScheduleStartTime()); h.mTvStart.setText(mData.get(i).getScheduleStart() + " " + mData.get(i).getScheduleStartTime());

14
oamodule/src/main/java/com/tenlionsoft/oamodule/beans/MineJoinMeetingListBean.java
View File

@ -48,6 +48,20 @@ public class MineJoinMeetingListBean {
private String userName; private String userName;
private String userType; private String userType;
@Override
public String toString() {
return "RowsBean{" +
"isSign=" + isSign +
", meetingDTO=" + meetingDTO +
", meetingId='" + meetingId + '\'' +
", meetingUserId='" + meetingUserId + '\'' +
", signTime='" + signTime + '\'' +
", userId='" + userId + '\'' +
", userName='" + userName + '\'' +
", userType='" + userType + '\'' +
'}';
}
public int getIsSign() { public int getIsSign() {
return isSign; return isSign;
} }

54
oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java
View File

@ -167,21 +167,7 @@ public class PadOaMainFragment extends BaseFragment {
BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_NOTICE_LIST); BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_NOTICE_LIST);
mPadMainActivity.addFragment(1, fragment); mPadMainActivity.addFragment(1, fragment);
}); });
//获取会议
mMeetingDatas = new ArrayList<>();
mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas);
mRlvMeeting.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvMeeting.setAdapter(mMeetingTimeAdapter);
mMeetingTimeAdapter.addOnItemClickListener(rowsBean -> {
BaseFragment fragment =
FragmentUtils.getFragmentOne(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL, "id",
rowsBean.getMeetingId());
mPadMainActivity.addFragment(1, fragment);
});
mTvMeetingMore.setOnClickListener(v -> {
BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING);
mPadMainActivity.addFragment(1, fragment);
});
//我的督办 //我的督办
mSuperviseBeans = new ArrayList<>(); mSuperviseBeans = new ArrayList<>();
mSuperviseHomeAdapter = new SuperviseHomeAdapter(mActivity, mSuperviseBeans); mSuperviseHomeAdapter = new SuperviseHomeAdapter(mActivity, mSuperviseBeans);
@ -249,13 +235,29 @@ public class PadOaMainFragment extends BaseFragment {
@Override @Override
public void onConfigurationChanged(@androidx.annotation.NonNull Configuration newConfig) { public void onConfigurationChanged(@androidx.annotation.NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
LogUtils.e("横竖屏切换===" + newConfig.orientation);
if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
//竖屏 //竖屏
mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140); mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140);
mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 2);
} else { } else {
//横屏 //横屏
mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20); mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20);
mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 1);
} }
mMeetingTimeAdapter.setData(mMeetingDatas);
mRlvMeeting.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvMeeting.setAdapter(mMeetingTimeAdapter);
mMeetingTimeAdapter.addOnItemClickListener(rowsBean -> {
BaseFragment fragment =
FragmentUtils.getFragmentOne(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL, "id",
rowsBean.getMeetingId());
mPadMainActivity.addFragment(1, fragment);
});
mTvMeetingMore.setOnClickListener(v -> {
BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING);
mPadMainActivity.addFragment(1, fragment);
});
mFunctionAdapter.setData(mFuncBeans); mFunctionAdapter.setData(mFuncBeans);
} }
@ -263,6 +265,8 @@ public class PadOaMainFragment extends BaseFragment {
* 刷新页面 * 刷新页面
*/ */
private void doRefresh() { private void doRefresh() {
//会议
mMeetingDatas = new ArrayList<>();
//常用功能 //常用功能
mFuncBeans = new ArrayList<>(); mFuncBeans = new ArrayList<>();
FlexboxLayoutManager flexboxLayoutManager = new FlexboxLayoutManager(mActivity, FlexDirection.ROW, FlexboxLayoutManager flexboxLayoutManager = new FlexboxLayoutManager(mActivity, FlexDirection.ROW,
@ -270,19 +274,32 @@ public class PadOaMainFragment extends BaseFragment {
//判断横竖屏 //判断横竖屏
Configuration configuration = mActivity.getResources().getConfiguration(); Configuration configuration = mActivity.getResources().getConfiguration();
int orientation = configuration.orientation; int orientation = configuration.orientation;
LogUtils.e(orientation);
if (orientation == Configuration.ORIENTATION_PORTRAIT) { if (orientation == Configuration.ORIENTATION_PORTRAIT) {
//竖屏 //竖屏
mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140); mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140);
mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 2);
} else { } else {
//横屏 //横屏
mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20); mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20);
mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 1);
} }
//功能按钮
mRlvFuncs.setLayoutManager(flexboxLayoutManager); mRlvFuncs.setLayoutManager(flexboxLayoutManager);
mRlvFuncs.setAdapter(mFunctionAdapter); mRlvFuncs.setAdapter(mFunctionAdapter);
mFunctionAdapter.addOnItemClickListener(this::choosePage); mFunctionAdapter.addOnItemClickListener(this::choosePage);
//获取会议
mRlvMeeting.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvMeeting.setAdapter(mMeetingTimeAdapter);
mMeetingTimeAdapter.addOnItemClickListener(rowsBean -> {
BaseFragment fragment =
FragmentUtils.getFragmentOne(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL, "id",
rowsBean.getMeetingId());
mPadMainActivity.addFragment(1, fragment);
});
mTvMeetingMore.setOnClickListener(v -> {
BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING);
mPadMainActivity.addFragment(1, fragment);
});
mCsvSchedule.setState(CustomStateView.STATE_LOAD); mCsvSchedule.setState(CustomStateView.STATE_LOAD);
mCsvFuncs.setState(CustomStateView.STATE_LOAD); mCsvFuncs.setState(CustomStateView.STATE_LOAD);
@ -529,6 +546,7 @@ public class PadOaMainFragment extends BaseFragment {
@Override @Override
public void onNext(@NonNull MineJoinMeetingListBean listBean) { public void onNext(@NonNull MineJoinMeetingListBean listBean) {
LogUtils.e(listBean.getRows());
if (listBean.getRows() != null && listBean.getRows().size() > 0) { if (listBean.getRows() != null && listBean.getRows().size() > 0) {
mCsvMeeting.setState(CustomStateView.STATE_SUCCESS); mCsvMeeting.setState(CustomStateView.STATE_SUCCESS);
mMeetingDatas = listBean.getRows(); mMeetingDatas = listBean.getRows();

283
oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingAddFragment.java
View File

@ -13,6 +13,12 @@ import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder;
@ -56,11 +62,6 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@ -77,7 +78,7 @@ import okhttp3.RequestBody;
* 作者: adam * 作者: adam
* 日期: 2022/5/9 - 14:31 * 日期: 2022/5/9 - 14:31
* 邮箱: itgaojian@163.com * 邮箱: itgaojian@163.com
* 描述: * 描述: 平板会议申请
*/ */
@Route(path = PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_ADD) @Route(path = PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_ADD)
public class MeetingAddFragment extends BaseFragment { public class MeetingAddFragment extends BaseFragment {
@ -215,27 +216,27 @@ public class MeetingAddFragment extends BaseFragment {
ToastUtils.show("超过最大上传数量限制"); ToastUtils.show("超过最大上传数量限制");
} else { } else {
new LFilePicker() new LFilePicker()
.withFragment(MeetingAddFragment.this) .withFragment(MeetingAddFragment.this)
.withFragmentLauncher(mFileLauncher) .withFragmentLauncher(mFileLauncher)
.withRequestCode(LionActions.REQUEST_CODE_AC) .withRequestCode(LionActions.REQUEST_CODE_AC)
.withTitle("文件选择") .withTitle("文件选择")
.withMaxNum(mFileMax) .withMaxNum(mFileMax)
.withFileFilter(fileFilter) .withFileFilter(fileFilter)
.start(); .start();
} }
} }
private void showConfirmDialog(MeetingAttachListBean bean, int i) { private void showConfirmDialog(MeetingAttachListBean bean, int i) {
new AlertDialog.Builder(mActivity) new AlertDialog.Builder(mActivity)
.setTitle("提示") .setTitle("提示")
.setMessage("确定要删除该参会人员吗?") .setMessage("确定要删除该参会人员吗?")
.setPositiveButton("确定", (dialog, which) -> { .setPositiveButton("确定", (dialog, which) -> {
mJoinPerson.remove(i); mJoinPerson.remove(i);
mPersonShowAdapter.notifyDataSetChanged(); mPersonShowAdapter.notifyDataSetChanged();
}) })
.setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
.create() .create()
.show(); .show();
} }
@Override @Override
@ -315,26 +316,26 @@ public class MeetingAddFragment extends BaseFragment {
case 2: case 2:
//判断时间大小 //判断时间大小
String start = mTvStartTime.getText().toString().trim(); String start = mTvStartTime.getText().toString().trim();
if(!TextUtils.isEmpty(start)){ if (!TextUtils.isEmpty(start)) {
int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start)); int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start));
if (span >= 0) { if (span >= 0) {
mTvEndTime.setText(TimeUtils.date2String(date)); mTvEndTime.setText(TimeUtils.date2String(date));
} else { } else {
ToastUtils.show("结束时间须大于开始时间"); ToastUtils.show("结束时间须大于开始时间");
} }
}else{ } else {
ToastUtils.show("请选择开始时间"); ToastUtils.show("请选择开始时间");
} }
break; break;
} }
}) })
.setTitleText("请选时间") .setTitleText("请选时间")
.setCancelColor(Color.parseColor("#1189FF")) .setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF")) .setSubmitColor(Color.parseColor("#1189FF"))
.isDialog(false) .isDialog(false)
.setType(new boolean[]{true, true, true, true, true, true}) .setType(new boolean[]{true, true, true, true, true, true})
.setTitleColor(Color.parseColor("#1189FF")) .setTitleColor(Color.parseColor("#1189FF"))
.build(); .build();
mTimePickerView.show(); mTimePickerView.show();
} }
@ -363,52 +364,52 @@ public class MeetingAddFragment extends BaseFragment {
Observable<BaseSuccessBean>[] observables1 = requests.toArray(new Observable[requests.size()]); Observable<BaseSuccessBean>[] observables1 = requests.toArray(new Observable[requests.size()]);
Observable.mergeArrayDelayError(observables1) Observable.mergeArrayDelayError(observables1)
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer() { .subscribe(new Observer() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NotNull Object o) {
++mUploadCount;
mTvFileHint.setVisibility(View.GONE);
if (o instanceof BaseSuccessBean) {
--mFileMax;
//刷新文件
BaseSuccessBean bean = (BaseSuccessBean) o;
AddFileBean fileBean = new AddFileBean();
fileBean.setId(bean.getData());
fileBean.setPath(BaseUrlApi.BASE_IMG_URL + bean.getData());
fileBean.setFileType(1);
fileBean.setFileName(fileNames.get(mUploadCount - 1));
mFileBeans.add(0, fileBean);
} }
mAddFileAdapter.notifyDataSetChanged();
if (mUploadCount == paths.size()) { @Override
public void onNext(@NotNull Object o) {
++mUploadCount;
mTvFileHint.setVisibility(View.GONE);
if (o instanceof BaseSuccessBean) {
--mFileMax;
//刷新文件
BaseSuccessBean bean = (BaseSuccessBean) o;
AddFileBean fileBean = new AddFileBean();
fileBean.setId(bean.getData());
fileBean.setPath(BaseUrlApi.BASE_IMG_URL + bean.getData());
fileBean.setFileType(1);
fileBean.setFileName(fileNames.get(mUploadCount - 1));
mFileBeans.add(0, fileBean);
}
mAddFileAdapter.notifyDataSetChanged();
if (mUploadCount == paths.size()) {
mUploadCount = 0;
if (progressDialog.isShowing()) {
progressDialog.dismiss();
}
}
}
@Override
public void onError(@NonNull Throwable e) {
e.printStackTrace();
mUploadCount = 0; mUploadCount = 0;
if (progressDialog.isShowing()) { if (progressDialog.isShowing()) {
progressDialog.dismiss(); progressDialog.dismiss();
} }
ToastUtils.show("上传失败,请稍后重试.");
} }
}
@Override @Override
public void onError(@NonNull Throwable e) { public void onComplete() {
e.printStackTrace();
mUploadCount = 0;
if (progressDialog.isShowing()) {
progressDialog.dismiss();
} }
ToastUtils.show("上传失败,请稍后重试."); });
}
@Override
public void onComplete() {
}
});
} }
private Observable createObservable(File file) { private Observable createObservable(File file) {
@ -417,9 +418,9 @@ public class MeetingAddFragment extends BaseFragment {
MultipartBody.Part body; MultipartBody.Part body;
body = MultipartBody.Part.createFormData("file", file.getName(), requestFile); body = MultipartBody.Part.createFormData("file", file.getName(), requestFile);
return RetrofitManager.getInstance() return RetrofitManager.getInstance()
.create(BaseApiService.class) .create(BaseApiService.class)
.uploadFile(body) .uploadFile(body)
.compose(RxTransformer.getTransformer()); .compose(RxTransformer.getTransformer());
} }
/** /**
@ -433,11 +434,11 @@ public class MeetingAddFragment extends BaseFragment {
mSelType = mTyps.get(o1); mSelType = mTyps.get(o1);
mTvType.setText(mSelType.getDataName()); mTvType.setText(mSelType.getDataName());
}) })
.setTitleText("请选择") .setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF")) .setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF")) .setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF")) .setTitleColor(Color.parseColor("#1189FF"))
.build(); .build();
mTypePicker.setPicker(mTyps); mTypePicker.setPicker(mTyps);
} }
mTypePicker.show(); mTypePicker.show();
@ -453,74 +454,35 @@ public class MeetingAddFragment extends BaseFragment {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
dialog.show(); dialog.show();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(BaseApiService.class) .create(BaseApiService.class)
.getDictListAllByPid(pId) .getDictListAllByPid(pId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<DicBean>>() { .subscribe(new Observer<List<DicBean>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull List<DicBean> beans) {
dialog.dismiss();
if (beans.size() > 0) {
switch (i) {
case 1://会议室类型
mTyps = beans;
onShowType();
break;
}
} else {
ToastUtils.show("暂无数据");
}
}
@Override
public void onError(@NonNull Throwable e) {
dialog.dismiss();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
}
});
}
private void doConfirm() {
if (checkParams()) {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
dialog.show();
RequestBody body = buildParams();
RetrofitManager.getInstance()
.create(OAApi.class)
.doSaveMeeting(body)
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<BaseSuccessBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull BaseSuccessBean baseSuccessBean) { public void onNext(@NonNull List<DicBean> beans) {
if (dialog.isShowing()) dialog.dismiss(); dialog.dismiss();
ToastUtils.show("保存成功"); if (beans.size() > 0) {
BaseFragment preFragment = mMainActivity.getPreFragment(); switch (i) {
if (preFragment != null) { case 1://会议室类型
preFragment.mIsRefresh = true; mTyps = beans;
onShowType();
break;
}
} else {
ToastUtils.show("暂无数据");
} }
mMainActivity.backFragment(1, MeetingAddFragment.this);
} }
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
if (dialog.isShowing()) dialog.dismiss(); dialog.dismiss();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
} }
@ -529,6 +491,45 @@ public class MeetingAddFragment extends BaseFragment {
} }
}); });
}
private void doConfirm() {
if (checkParams()) {
ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
dialog.show();
RequestBody body = buildParams();
RetrofitManager.getInstance()
.create(OAApi.class)
.doSaveMeeting(body)
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<BaseSuccessBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull BaseSuccessBean baseSuccessBean) {
if (dialog.isShowing()) dialog.dismiss();
ToastUtils.show("保存成功");
BaseFragment preFragment = mMainActivity.getPreFragment();
if (preFragment != null) {
preFragment.mIsRefresh = true;
}
mMainActivity.backFragment(1, MeetingAddFragment.this);
}
@Override
public void onError(@NonNull Throwable e) {
if (dialog.isShowing()) dialog.dismiss();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
}
});
} }
} }

2
oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingDetailFragment.java
View File

@ -65,7 +65,7 @@ import static com.tenlionsoft.baselib.core.widget.PhotoActivity.TAG_IMGURL;
* 作者: adam * 作者: adam
* 日期: 2022/5/9 - 15:20 * 日期: 2022/5/9 - 15:20
* 邮箱: itgaojian@163.com * 邮箱: itgaojian@163.com
* 描述: 会议详情 * 描述: 平板------会议详情
*/ */
@Route(path = PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL) @Route(path = PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL)
public class MeetingDetailFragment extends BaseFragment { public class MeetingDetailFragment extends BaseFragment {

4
oamodule/src/main/res/layout/fragment_meeting.xml
View File

@ -76,7 +76,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left" android:background="@drawable/switch_custom_gray_white_center"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:paddingLeft="10dp" android:paddingLeft="10dp"
@ -92,7 +92,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left" android:background="@drawable/switch_custom_gray_white_right"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:paddingLeft="10dp" android:paddingLeft="10dp"

834
oamodule/src/main/res/layout/fragment_meeting_add.xml
View File

@ -4,18 +4,16 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_f0" android:background="@color/gray_f2"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp"
tools:context=".activity.car.ByCarAddActivity"> tools:context=".activity.car.ByCarAddActivity">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="10dp" android:paddingBottom="105dp"
android:layout_marginBottom="105dp"
android:background="@color/white"
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
@ -28,18 +26,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="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/white">
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.TypeFaceEditText <com.tenlionsoft.baselib.core.widget.views.TypeFaceEditText
android:id="@+id/et_name" android:id="@+id/et_name"
@ -47,115 +38,83 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@null" 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" /> android:textSize="14sp" />
</LinearLayout> </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/white">
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" <LinearLayout
android:text="会议类型" android:layout_width="0dp"
android:textColor="@color/black" 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" android:focusable="true"
android:focusable="true" android:gravity="left|center_vertical"
android:gravity="right" android:hint="开始时间"
android:hint="请选择会议类型" android:minHeight="50dp"
android:textColor="@color/black" android:textColor="@color/text_80_gray"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_hor_content">
<ImageView
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView android:layout_width="2dp"
android:layout_width="wrap_content" android:layout_height="30dp"
android:layout_height="wrap_content" android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical" android:src="@drawable/ic_line_hor_gray" />
android:text="主持人"
android:textColor="@color/black" <LinearLayout
android:textSize="14sp" /> android:layout_width="0dp"
android:layout_height="wrap_content"
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView android:layout_weight="1"
android:id="@+id/tv_emcee" android:gravity="center">
android:layout_width="match_parent"
android:layout_height="wrap_content" <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_gravity="center_vertical" android:id="@+id/tv_end_time"
android:clickable="true" android:layout_width="wrap_content"
android:drawableRight="@drawable/ic_arrow_right" android:layout_height="wrap_content"
android:focusable="true" android:clickable="true"
android:gravity="right" android:focusable="true"
android:hint="请选择会议主持人" android:gravity="left|center_vertical"
android:textColor="@color/black" android:hint="结束时间"
android:textSize="14sp" /> android:minHeight="50dp"
</LinearLayout> android:textColor="@color/text_80_gray"
android:textSize="14sp" />
<LinearLayout style="@style/item_hor_content"> </LinearLayout>
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView </LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content" <LinearLayout
android:layout_gravity="center_vertical" style="@style/item_hor_content_no_margin_padding"
android:text="开始时间" android:layout_marginTop="5dp"
android:textColor="@color/black" android:background="@color/white">
android:textSize="14sp" />
<ImageView
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView android:layout_width="17dp"
android:id="@+id/tv_start_time" android:layout_height="17dp"
android:layout_width="match_parent" android:src="@drawable/ic_meeting_room_icon" />
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议开始时间"
android:textColor="@color/black"
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:drawableRight="@drawable/ic_arrow_right"
android:focusable="true"
android:gravity="right"
android:hint="请选择会议结束时间"
android:textColor="@color/black"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:text="会议室" android:text="会议室"
android:textColor="@color/black" android:textColor="@color/black_10"
android:textSize="14sp" /> android:textSize="14sp" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
@ -164,22 +123,157 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
android:drawableRight="@drawable/ic_arrow_right" android:drawableRight="@drawable/ic_arrow_right_24"
android:drawablePadding="5dp"
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="请选择会议室" android:hint="请选择会议室"
android:textColor="@color/black" android:textColor="@color/text_80_gray"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout
style="@style/item_hor_content_no_margin_padding"
android:background="@color/white">
<ImageView
android:layout_width="17dp"
android:layout_height="17dp"
android:src="@drawable/ic_meeting_emcee_icon" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" 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/white"
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/white">
<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/white">
<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:text="通知方式"
android:textColor="@color/black" android:textColor="@color/black_10"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
@ -198,7 +292,8 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray" android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:padding="5dp" android:padding="5dp"
android:text="短信" /> android:text="短信"
android:textColor="@color/col_blue_gray" />
<CheckBox <CheckBox
android:id="@+id/cb_notice_email" android:id="@+id/cb_notice_email"
@ -209,77 +304,49 @@
android:drawableLeft="@drawable/sel_checkbox_blue_gray" android:drawableLeft="@drawable/sel_checkbox_blue_gray"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:padding="5dp" android:padding="5dp"
android:text="邮件" /> android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
<LinearLayout style="@style/item_ver"> <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" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray">
<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="50"
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"
android:textSize="14sp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:orientation="horizontal">
android:background="@drawable/shp_rectangle_gray"
<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"> android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceEditText <com.tenlionsoft.baselib.core.widget.views.TypeFaceEditText
@ -292,8 +359,17 @@
android:hint="请输入会议内容" android:hint="请输入会议内容"
android:minLines="3" android:minLines="3"
android:padding="5dp" android:padding="5dp"
android:textColor="@color/black" android:textColor="@color/black_10"
android:textSize="14sp" /> android:textSize="14sp" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_content_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:gravity="right"
android:text="0/140"
android:textSize="@dimen/text_12" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -302,25 +378,39 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
<LinearLayout style="@style/item_ver"> <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_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 <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:background="@drawable/shp_rectangle_gray" android:background="@drawable/shp_rectangle_gray_df"
android:orientation="vertical"> android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -354,6 +444,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="10dp"> android:padding="10dp">
@ -375,4 +466,377 @@
android:text="提交申请" android:text="提交申请"
android:textColor="@color/col_white_gray_press" /> android:textColor="@color/col_white_gray_press" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
<!-- xmlns:tools="http://schemas.android.com/tools"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/gray_f0"-->
<!-- android:orientation="vertical"-->
<!-- tools:context=".activity.car.ByCarAddActivity">-->
<!-- <androidx.core.widget.NestedScrollView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:layout_marginRight="10dp"-->
<!-- android:layout_marginBottom="105dp"-->
<!-- android:background="@color/white"-->
<!-- android:scrollbars="none">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- android:paddingTop="10dp"-->
<!-- android:paddingBottom="10dp">-->
<!-- <LinearLayout style="@style/item_ver">-->
<!-- <com.tenlionsoft.baselib.core.widget.views.TypeFaceEditText-->
<!-- android:id="@+id/et_name"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:background="@null"-->
<!-- android:gravity="left"-->
<!-- android:hint="请输入会议标题"-->
<!-- android:lines="3"-->
<!-- 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_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"-->
<!-- android:focusable="true"-->
<!-- android:gravity="right"-->
<!-- android:hint="请选择会议类型"-->
<!-- android:textColor="@color/black"-->
<!-- 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:drawableRight="@drawable/ic_arrow_right"-->
<!-- android:focusable="true"-->
<!-- android:gravity="right"-->
<!-- android:hint="请选择会议主持人"-->
<!-- android:textColor="@color/black"-->
<!-- 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:drawableRight="@drawable/ic_arrow_right"-->
<!-- android:focusable="true"-->
<!-- android:gravity="right"-->
<!-- android:hint="请选择会议开始时间"-->
<!-- android:textColor="@color/black"-->
<!-- 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:drawableRight="@drawable/ic_arrow_right"-->
<!-- android:focusable="true"-->
<!-- android:gravity="right"-->
<!-- android:hint="请选择会议结束时间"-->
<!-- android:textColor="@color/black"-->
<!-- 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:drawableRight="@drawable/ic_arrow_right"-->
<!-- android:focusable="true"-->
<!-- android:gravity="right"-->
<!-- android:hint="请选择会议室"-->
<!-- android:textColor="@color/black"-->
<!-- 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" />-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="right"-->
<!-- android:orientation="horizontal">-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_notice_msg"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginRight="10dp"-->
<!-- android:background="@drawable/shape_rectangle_white_gray_border"-->
<!-- android:button="@null"-->
<!-- android:drawableLeft="@drawable/sel_checkbox_blue_gray"-->
<!-- android:drawablePadding="5dp"-->
<!-- android:padding="5dp"-->
<!-- android:text="短信" />-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_notice_email"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/shape_rectangle_white_gray_border"-->
<!-- android:button="@null"-->
<!-- android:drawableLeft="@drawable/sel_checkbox_blue_gray"-->
<!-- android:drawablePadding="5dp"-->
<!-- android:padding="5dp"-->
<!-- android:text="邮件" />-->
<!-- </LinearLayout>-->
<!-- </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"-->
<!-- android:textSize="14sp" />-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/shp_rectangle_gray">-->
<!-- <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="50"-->
<!-- 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"-->
<!-- android:textSize="14sp" />-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:background="@drawable/shp_rectangle_gray"-->
<!-- android:orientation="vertical">-->
<!-- <com.tenlionsoft.baselib.core.widget.views.TypeFaceEditText-->
<!-- android:id="@+id/et_content"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:background="@null"-->
<!-- android:gravity="left"-->
<!-- android:hint="请输入会议内容"-->
<!-- android:minLines="3"-->
<!-- 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: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" />-->
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:background="@drawable/shp_rectangle_gray"-->
<!-- android:orientation="vertical">-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rlv_files"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- tools:itemCount="3" />-->
<!-- <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
<!-- android:id="@+id/tv_file_hint"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:hint="会议文件"-->
<!-- android:padding="20dp"-->
<!-- android:textSize="@dimen/text_14" />-->
<!-- </RelativeLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </androidx.core.widget.NestedScrollView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:background="@color/white"-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal"-->
<!-- android:padding="10dp">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_add_file"-->
<!-- android:layout_width="20dp"-->
<!-- android:layout_height="20dp"-->
<!-- android:src="@drawable/ic_add_file_link" />-->
<!-- </LinearLayout>-->
<!-- <Button-->
<!-- android:id="@+id/btn_confirm"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:layout_marginRight="10dp"-->
<!-- android:layout_marginBottom="3dp"-->
<!-- android:background="@drawable/sel_btn_submit_no_size"-->
<!-- android:text="提交申请"-->
<!-- android:textColor="@color/col_white_gray_press" />-->
<!-- </LinearLayout>-->
<!--</RelativeLayout>-->

845
oamodule/src/main/res/layout/fragment_meeting_detail.xml
View File

@ -4,15 +4,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_f0" android:background="@color/gray_f2"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp"
tools:context=".activity.car.ByCarAddActivity"> tools:context=".activity.car.ByCarAddActivity">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="10dp"
android:background="@color/white"
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
@ -24,20 +23,14 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="10dp" android:paddingTop="5dp"
android:paddingBottom="10dp"> 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/white">
android:layout_gravity="center_vertical"
android:text="会议标题"
android:textColor="@color/black"
android:textSize="14sp" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
@ -45,20 +38,224 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@null" android:background="@null"
android:gravity="right" android:hint="会议标题"
android:hint="未录入" android:minLines="2"
android:textColor="@color/black" android:padding="5dp"
android:textColor="@color/text_80_gray"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout
style="@style/item_hor_content_no_margin"
android:layout_marginTop="5dp"
android:background="@color/white">
<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/white">
<ImageView
android:layout_width="17dp"
android:layout_height="17dp"
android:src="@drawable/ic_meeting_room_icon" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" 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_no_margin_padding"
android:background="@color/white">
<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/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">
<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/white">
<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:text="会议类型"
android:textColor="@color/black" android:textColor="@color/black_10"
android:textSize="14sp" /> android:textSize="14sp" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
@ -70,110 +267,28 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" 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 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/white">
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/black"
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/black"
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/black"
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/black"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout style="@style/item_hor_content">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:text="通知方式" android:text="通知方式"
android:textColor="@color/black" android:textColor="@color/black_10"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
@ -193,7 +308,8 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:enabled="false" android:enabled="false"
android:padding="5dp" android:padding="5dp"
android:text="短信" /> android:text="短信"
android:textColor="@color/col_blue_gray" />
<CheckBox <CheckBox
android:id="@+id/cb_notice_email" android:id="@+id/cb_notice_email"
@ -205,16 +321,17 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:enabled="false" android:enabled="false"
android:padding="5dp" android:padding="5dp"
android:text="邮件" /> android:text="邮件"
android:textColor="@color/col_blue_gray" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp" android:paddingTop="5dp"
@ -222,83 +339,32 @@
<LinearLayout style="@style/item_ver"> <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">
<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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:orientation="horizontal">
android:background="@drawable/shp_rectangle_gray"
<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"> android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
@ -313,10 +379,12 @@
android:padding="5dp" android:padding="5dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -328,19 +396,32 @@
<LinearLayout style="@style/item_ver"> <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_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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:background="@drawable/shp_rectangle_gray" android:background="@drawable/shp_rectangle_gray_df"
android:orientation="vertical"> android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -362,4 +443,370 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</RelativeLayout> </RelativeLayout>
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
<!-- xmlns:tools="http://schemas.android.com/tools"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/gray_f0"-->
<!-- android:orientation="vertical"-->
<!-- tools:context=".activity.car.ByCarAddActivity">-->
<!-- <androidx.core.widget.NestedScrollView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_margin="10dp"-->
<!-- android:background="@color/white"-->
<!-- android:scrollbars="none">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- 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: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" />-->
<!-- <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
<!-- android:id="@+id/tv_name"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:background="@null"-->
<!-- android:gravity="right"-->
<!-- android:hint="未录入"-->
<!-- android:textColor="@color/black"-->
<!-- 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_type"-->
<!-- 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/black"-->
<!-- 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/black"-->
<!-- 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/black"-->
<!-- 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/black"-->
<!-- 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/black"-->
<!-- 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" />-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="right"-->
<!-- android:orientation="horizontal">-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_notice_msg"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginRight="10dp"-->
<!-- android:background="@drawable/shape_rectangle_white_gray_border"-->
<!-- android:button="@null"-->
<!-- android:drawableLeft="@drawable/sel_checkbox_blue_gray"-->
<!-- android:drawablePadding="5dp"-->
<!-- android:enabled="false"-->
<!-- android:padding="5dp"-->
<!-- android:text="短信" />-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_notice_email"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/shape_rectangle_white_gray_border"-->
<!-- android:button="@null"-->
<!-- android:drawableLeft="@drawable/sel_checkbox_blue_gray"-->
<!-- android:drawablePadding="5dp"-->
<!-- android:enabled="false"-->
<!-- android:padding="5dp"-->
<!-- android:text="邮件" />-->
<!-- </LinearLayout>-->
<!-- </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">-->
<!-- <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">-->
<!-- <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:background="@drawable/shp_rectangle_gray"-->
<!-- android:orientation="vertical">-->
<!-- <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
<!-- android:id="@+id/tv_content"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:background="@null"-->
<!-- android:gravity="left"-->
<!-- android:hint="未录入"-->
<!-- android:minLines="3"-->
<!-- 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: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:background="@drawable/shp_rectangle_gray"-->
<!-- android:orientation="vertical">-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rlv_files"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- tools:itemCount="3"-->
<!-- tools:visibility="gone" />-->
<!-- <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView-->
<!-- android:id="@+id/tv_file_hint"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center"-->
<!-- android:padding="20dp"-->
<!-- android:text="未录入" />-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </androidx.core.widget.NestedScrollView>-->
<!--</RelativeLayout>-->

2
oamodule/src/main/res/layout/fragment_routine_work.xml
View File

@ -76,7 +76,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left" android:background="@drawable/switch_custom_gray_white_right"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:paddingLeft="10dp" android:paddingLeft="10dp"

2
oamodule/src/main/res/layout/fragment_supervise.xml
View File

@ -76,7 +76,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/switch_custom_gray_white_left" android:background="@drawable/switch_custom_gray_white_right"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:paddingLeft="10dp" android:paddingLeft="10dp"

84
oamodule/src/main/res/layout/item_meeting_time_p.xml Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_blue_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
tools:layout_margin="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_clock_icon" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="@color/status_bar_blue"
android:textSize="10sp"
tools:text="今天 09:00" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:background="@color/white"
android:orientation="vertical"
android:padding="10dp">
<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/status_bar_blue"
android:textSize="@dimen/text_12"
tools:text="关于整治监狱掮客大" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_emcee"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/status_bar_blue"
android:textSize="@dimen/text_10"
tools:text="主持人" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginLeft="2dp"
android:background="@color/status_bar_blue" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/status_bar_blue"
android:textSize="@dimen/text_10"
tools:text="会议室" />
</LinearLayout>
</LinearLayout>
</LinearLayout>