邮件页面、我的页面布局调整

This commit is contained in:
adam 2022-04-27 15:32:46 +08:00
parent 9b59a86871
commit 974d31662c
40 changed files with 853 additions and 200 deletions

View File

@ -111,7 +111,7 @@ public class PathConfig {
public static final String PATH_MODULE_MAIN_FRAGMENT_GRID = "/modulemain/fragment/grid";//网格员模块
public static final String PATH_MODULE_MAIN_FRAGMENT_SUPERVISION = "/modulemain/fragment/supervision";//监管模块
public static final String PATH_MODULE_MAIN_FRAGMENT_LEADER = "/modulemain/fragment/leader";//领导l模块
public static final String PATH_MODULE_MAIN_FRAGMENT_USER = "/modulemain/fragment/user";
//====================Player=======================

Binary file not shown.

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 244 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 521 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B

View File

@ -3,8 +3,9 @@
android:id="@+id/ll_base_search_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<EditText
@ -18,7 +19,7 @@
android:drawablePadding="5dp"
android:hint="搜索"
android:imeOptions="actionSearch"
android:padding="3dp"
android:padding="6dp"
android:singleLine="true"
android:textSize="14sp" />
@ -29,5 +30,6 @@
android:clickable="true"
android:focusable="true"
android:text="取消"
android:textColor="@color/gray_text" />
android:textColor="@color/gray_text"
android:textSize="@dimen/text_16" />
</LinearLayout>

View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_base_search_cancel_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray_5"
android:drawableLeft="@drawable/ic_search_icon_gray"
android:drawablePadding="5dp"
android:hint="搜索"
android:imeOptions="actionSearch"
android:padding="6dp"
android:singleLine="true"
android:textSize="14sp" />
</LinearLayout>

View File

@ -57,6 +57,7 @@
android:name=".base.SplashActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/FadeAnimActivity"
android:windowSoftInputMode="adjustPan|stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@ -123,7 +123,7 @@ public class MainTabActivity extends BaseActivity {
BaseFragment homeFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_HOME);
BaseFragment docFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_DOC);
BaseFragment emailFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_EMAIL);
BaseFragment userFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_MAIN_FRAGMENT_USER);
BaseFragment userFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_MINE);
mFragments.add(homeFragment);
mFragments.add(docFragment);
mFragments.add(emailFragment);

View File

@ -1,72 +0,0 @@
package com.tengshisoft.mainmodule.fragments;
import android.view.View;
import android.widget.Button;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.tengshisoft.mainmodule.R;
import com.tengshisoft.mainmodule.R2;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.utils.LogUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* 作者: adam
* 日期: 2022/3/31 - 9:26 上午
* 邮箱: itgaojian@163.com
* 描述: 个人中心
*/
@Route(path = PathConfig.PATH_MODULE_MAIN_FRAGMENT_USER)
public class MineFragment extends BaseFragment {
@BindView(R2.id.btn_login_out)
Button mBtnLoginOut;
@BindView(R2.id.btn_user_record)
Button mBtnUserRecord;
private Unbinder mBind;
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
LogUtils.e("MineFragment");
doSync();
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
mBtnLoginOut.setOnClickListener(v -> doLoginOut());
mBtnUserRecord.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_DETAIL)
.navigation());
}
private void doLoginOut() {
this.mActivity.reStartApp();
}
/**
* 同步数据 需要更新9张表
*/
private void doSync() {
}
@Override
protected void refreshView() {
}
@Override
protected void loadMoreData() {
}
@Override
protected int getContentViewId() {
return R.layout.fragment_mine;
}
}

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="5dp"
android:text="同步数据"
android:textColor="@color/black"
android:textSize="18sp" />
<Button
android:id="@+id/btn_login_out"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="退出登录" />
<Button
android:id="@+id/btn_user_record"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="个人档案" />
</LinearLayout>

View File

@ -23,7 +23,12 @@
<activity android:name=".activity.notify.NoticeDetailActivity" />
<activity android:name=".activity.notify.NoticeListActivity" />
<activity android:name=".activity.email.SentBoxActivity" />
<activity android:name=".activity.email.InboxActivity" />
<activity
android:name=".activity.email.InboxActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/FadeAnimActivity"
android:windowSoftInputMode="stateVisible|adjustResize" />
<activity
android:name=".activity.email.SendEmailActivity"
android:launchMode="singleTop"

View File

@ -3,6 +3,7 @@ package com.tenlionsoft.oamodule.activity.email;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@ -19,6 +20,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2;
@ -92,6 +94,24 @@ public class DraftBoxActivity extends BaseActivity {
.navigation(mActivity, 12));
refreshStateView(LionActions.STATE_LOAD);
doRefresh();
mEtBaseSearchCancel.setOnEditorActionListener((v, actionId, event) -> {
LogUtils.e("搜索==" + actionId);
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtBaseSearchCancel.clearFocus();
mKeywords = v.getText().toString();
doRefresh();
return true;
} else {
return false;
}
});
mTvBaseSearchCancel.setOnClickListener(v -> {
mEtBaseSearchCancel.setText("");
mEtBaseSearchCancel.clearFocus();
mKeywords = "";
doRefresh();
});
}

View File

@ -89,6 +89,8 @@ public class DraftEmailDetailActivity extends BaseActivity {
} else {
getDetailById();
}
setTouchDelegate(mIvDel, 30);
setTouchDelegate(mIvTransfer, 30);
}
private void getDetailById() {

View File

@ -3,6 +3,7 @@ package com.tenlionsoft.oamodule.activity.email;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@ -19,6 +20,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2;
@ -91,7 +93,29 @@ public class InboxActivity extends BaseActivity {
.navigation(mActivity, 12));
refreshStateView(LionActions.STATE_LOAD);
doRefresh();
String key = getIntent().getStringExtra("key");
if (!TextUtils.isEmpty(key)) {
showSoftKeyBoardDialog(mEtBaseSearchCancel);
}
mEtBaseSearchCancel.setOnEditorActionListener((v, actionId, event) -> {
LogUtils.e("搜索==" + actionId);
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtBaseSearchCancel.clearFocus();
mKeywords = v.getText().toString();
doRefresh();
return true;
} else {
return false;
}
});
mTvBaseSearchCancel.setOnClickListener(v -> {
mEtBaseSearchCancel.setText("");
mEtBaseSearchCancel.clearFocus();
mKeywords = "";
doRefresh();
});
}
/**

View File

@ -91,6 +91,8 @@ public class InboxDetailActivity extends BaseActivity {
private void initView() {
mIvDel.setOnClickListener(v -> onShowConfirm(1));
mIvTransfer.setOnClickListener(v -> onShowConfirm(2));
setTouchDelegate(mIvDel, 30);
setTouchDelegate(mIvTransfer, 30);
}
private void onShowConfirm(int type) {
@ -223,7 +225,7 @@ public class InboxDetailActivity extends BaseActivity {
bean.setId(infoBean.getFileId());
bean.setFileName(infoBean.getFileName());
bean.setFileType(FileUtils.getFileType(infoBean.getFileName()));
bean.setPath(BaseUrlApi.BASE_FILE_URL+infoBean.getFileId());
bean.setPath(BaseUrlApi.BASE_FILE_URL + infoBean.getFileId());
mFileBeans.add(0, bean);
}
mAddFileAdapter.setData(mFileBeans);

View File

@ -5,6 +5,7 @@ import android.app.ProgressDialog;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@ -22,6 +23,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UIUtil;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
@ -101,7 +103,24 @@ public class RecycleBoxActivity extends BaseActivity {
// 来源(send:发件箱,inbox:收件箱,draft:草稿箱)
refreshStateView(LionActions.STATE_LOAD);
doRefresh();
mEtBaseSearchCancel.setOnEditorActionListener((v, actionId, event) -> {
LogUtils.e("搜索==" + actionId);
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtBaseSearchCancel.clearFocus();
mKeywords = v.getText().toString();
doRefresh();
return true;
} else {
return false;
}
});
mTvBaseSearchCancel.setOnClickListener(v -> {
mEtBaseSearchCancel.setText("");
mEtBaseSearchCancel.clearFocus();
mKeywords = "";
doRefresh();
});
}
private void onShowConfirm() {

View File

@ -93,6 +93,8 @@ public class RecycleEmailDetailActivity extends BaseActivity {
} else {
getDetailById();
}
setTouchDelegate(mIvDel, 30);
setTouchDelegate(mIvTransfer, 30);
}
private void getDetailById() {

View File

@ -88,6 +88,8 @@ public class SendEmailDetailActivity extends BaseActivity {
} else {
getDetailById();
}
setTouchDelegate(mIvDel, 30);
setTouchDelegate(mIvTransfer, 30);
}
private void getDetailById() {

View File

@ -3,6 +3,7 @@ package com.tenlionsoft.oamodule.activity.email;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@ -19,6 +20,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2;
@ -92,6 +94,24 @@ public class SentBoxActivity extends BaseActivity {
.navigation(mActivity, 12));
refreshStateView(LionActions.STATE_LOAD);
doRefresh();
mEtBaseSearchCancel.setOnEditorActionListener((v, actionId, event) -> {
LogUtils.e("搜索==" + actionId);
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtBaseSearchCancel.clearFocus();
mKeywords = v.getText().toString();
doRefresh();
return true;
} else {
return false;
}
});
mTvBaseSearchCancel.setOnClickListener(v -> {
mEtBaseSearchCancel.setText("");
mEtBaseSearchCancel.clearFocus();
mKeywords = "";
doRefresh();
});
}

View File

@ -1,5 +1,6 @@
package com.tenlionsoft.oamodule.activity.meeting;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
@ -82,6 +83,11 @@ public class MeetingCenterActivity extends BaseActivity {
.init();
refreshView(STATE_LOAD_SUCCESS);
initViews();
String type = getIntent().getStringExtra("type");
if (!TextUtils.isEmpty(type) && "emcee".equals(type)) {
mRbEmcee.setChecked(true);
// mVpContent.setCurrentItem(1, false);
}
}
private void initViews() {

View File

@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
import com.tenlionsoft.baselib.utils.TimeUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.beans.EmailDraftListBean;
import com.tenlionsoft.oamodule.beans.EmailInboxListBean;
@ -41,14 +42,16 @@ public class EmailAdapter extends BaseRecyclerAdapter<Object, EmailHolder> {
EmailDraftListBean.RowsBean bean = (EmailDraftListBean.RowsBean) o;
h.mTvTitle.setText(bean.getTitle());
h.mTvContent.setText(Html.fromHtml(bean.getContent()));
h.mTvTime.setText(bean.getGmtCreate());
String friendlyTimeSpanByNow = TimeUtils.getFriendlyTimeSpanByNow(bean.getGmtCreate());
h.mTvTime.setText(friendlyTimeSpanByNow);
h.mTvUser.setVisibility(View.INVISIBLE);
} else if (o instanceof EmailRecycleListBean.RowsBean) {
//回收站
EmailRecycleListBean.RowsBean bean = (EmailRecycleListBean.RowsBean) o;
String friendlyTimeSpanByNow = TimeUtils.getFriendlyTimeSpanByNow(bean.getGmtCreate());
h.mTvTitle.setText(bean.getTitle());
h.mTvContent.setText(Html.fromHtml(bean.getContent()));
h.mTvTime.setText(bean.getGmtCreate());
h.mTvTime.setText(friendlyTimeSpanByNow);
h.mTvUser.setText(bean.getCreatorNames());
h.mTvSource.setVisibility(View.VISIBLE);
//来源(send:发件箱,inbox:收件箱,draft:草稿箱)
@ -68,7 +71,8 @@ public class EmailAdapter extends BaseRecyclerAdapter<Object, EmailHolder> {
EmailInboxListBean.RowsBean bean = (EmailInboxListBean.RowsBean) o;
h.mTvTitle.setText(bean.getTitle());
h.mTvContent.setText(Html.fromHtml(bean.getContent()));
h.mTvTime.setText(bean.getGmtCreate());
String friendlyTimeSpanByNow = TimeUtils.getFriendlyTimeSpanByNow(bean.getGmtCreate());
h.mTvTime.setText(friendlyTimeSpanByNow);
h.mTvUser.setText(bean.getCreatorNames());
if ("1".equals(bean.getCopyForTypes())) {
h.mIvCopy.setVisibility(View.VISIBLE);
@ -80,9 +84,10 @@ public class EmailAdapter extends BaseRecyclerAdapter<Object, EmailHolder> {
} else if (o instanceof EmailSendListBean.RowsBean) {
//发件箱
EmailSendListBean.RowsBean bean = (EmailSendListBean.RowsBean) o;
String friendlyTimeSpanByNow = TimeUtils.getFriendlyTimeSpanByNow(bean.getGmtCreate());
h.mTvTitle.setText(bean.getTitle());
h.mTvContent.setText(Html.fromHtml(bean.getContent()));
h.mTvTime.setText(bean.getGmtCreate());
h.mTvTime.setText(friendlyTimeSpanByNow);
h.mTvUser.setVisibility(View.INVISIBLE);
}

View File

@ -1,7 +1,6 @@
package com.tenlionsoft.oamodule.fragments;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
@ -14,13 +13,20 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.beans.EmailInboxListBean;
import com.tenlionsoft.oamodule.net.OAApi;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
/**
* 作者: adam
@ -34,12 +40,6 @@ public class EmailFragment extends BaseFragment {
ImageView mIvAdd;
@BindView(R2.id.rl_title)
RelativeLayout mRlTitle;
@BindView(R2.id.et_base_search_cancel)
EditText mEtBaseSearchCancel;
@BindView(R2.id.tv_base_search_cancel)
TextView mTvBaseSearchCancel;
@BindView(R2.id.ll_base_search_cancel)
LinearLayout mLlBaseSearchCancel;
@BindView(R2.id.tv_inbox_num)
TextView mTvInboxNum;
@BindView(R2.id.rl_inbox)
@ -54,6 +54,16 @@ public class EmailFragment extends BaseFragment {
LinearLayout mLlContent;
@BindView(R2.id.iv_user_icon)
ImageView mIvUserIcon;
@BindView(R2.id.iv_inbox_title)
ImageView mIvInboxTitle;
@BindView(R2.id.ll_send_box)
LinearLayout mLlSendBox;
@BindView(R2.id.ll_draft_box)
LinearLayout mLlDraftBox;
@BindView(R2.id.ll_recycle_box)
LinearLayout mLlRecycleBox;
@BindView(R2.id.ll_base_search_cancel_title)
LinearLayout mLlBaseSearchCancelTitle;
@Override
protected int getContentViewId() {
@ -69,18 +79,22 @@ public class EmailFragment extends BaseFragment {
mIvAdd.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_EMAIL_SEND)
.navigation());
mTvSentBox.setOnClickListener(v -> ARouter.getInstance()
mLlSendBox.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_EMAIL_SENTBOX)
.navigation());//发件箱
mTvRecycleBox.setOnClickListener(v -> ARouter.getInstance()
mLlRecycleBox.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_EMAIL_RECYCLE)
.navigation());//回收站
mTvDraftBox.setOnClickListener(v -> ARouter.getInstance()
mLlDraftBox.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_EMAIL_DRAFT)
.navigation());//草稿箱
mRlInbox.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_EMAIL_INBOX)
.navigation());//收件箱
mLlBaseSearchCancelTitle.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_EMAIL_INBOX)
.withString("key", "search")
.navigation());
}
@Override
@ -94,6 +108,35 @@ public class EmailFragment extends BaseFragment {
.placeholder(R.drawable.ic_user_default))
.into(mIvUserIcon);
//获取各个类型个数
getInboxList();
}
private void getInboxList() {
RetrofitManager.getInstance()
.create(OAApi.class)
.getEmailInboxList("", "1", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<EmailInboxListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull EmailInboxListBean emailInboxListBean) {
mTvInboxNum.setText(emailInboxListBean.getTotal() + "");
}
@Override
public void onError(@NonNull Throwable e) {
mTvInboxNum.setText("0");
}
@Override
public void onComplete() {
}
});
}
@Override

View File

@ -0,0 +1,196 @@
package com.tenlionsoft.oamodule.fragments;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.beans.UserInfoBean;
import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.beans.MineJoinMeetingListBean;
import com.tenlionsoft.oamodule.net.OAApi;
import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
/**
* 作者: adam
* 日期: 2022/3/31 - 9:26 上午
* 邮箱: itgaojian@163.com
* 描述: 个人中心
*/
@Route(path = PathConfig.PATH_MODULE_OA_FRAGMENT_MINE)
public class MineFragment extends BaseFragment {
@BindView(R2.id.iv_user_icon)
ImageView mIvUserIcon;
@BindView(R2.id.tv_name)
TextView mTvName;
@BindView(R2.id.tv_dept)
TextView mTvDept;
@BindView(R2.id.tv_join_meeting_num)
TextView mTvJoinMeetingNum;
@BindView(R2.id.ll_join_meeting)
LinearLayout mLlJoinMeeting;
@BindView(R2.id.tv_emcee_meeting_num)
TextView mTvEmceeMeetingNum;
@BindView(R2.id.ll_emcee_meeting)
LinearLayout mLlEmceeMeeting;
@BindView(R2.id.ll_schedule)
LinearLayout mLlSchedule;
@BindView(R2.id.tv_work_num)
TextView mTvWorkNum;
@BindView(R2.id.ll_day_work)
LinearLayout mLlDayWork;
@BindView(R2.id.ll_mine_team)
LinearLayout mLlMineTeam;
@BindView(R2.id.ll_mine_dept)
LinearLayout mLlMineDept;
@BindView(R2.id.ll_about_us)
LinearLayout mLlAboutUs;
@BindView(R2.id.ll_login_out)
LinearLayout mLlLoginOut;
private Unbinder mBind;
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
LogUtils.e("MineFragment");
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
mLlLoginOut.setOnClickListener(v -> doLoginOut());//退出登录
mLlJoinMeeting.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_MEETING)
.navigation());//参加的会议
mLlEmceeMeeting.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_MEETING)
.withString("type", "emcee")
.navigation());//主持的会议
mLlAboutUs.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_DETAIL)
.navigation());
}
private void doLoginOut() {
this.mActivity.reStartApp();
}
@Override
public void onResume() {
super.onResume();
Glide.with(mActivity)
.load(BaseUrlApi.BASE_IMG_URL + UserLgUtils.getAvatar())
.apply(RequestOptions.bitmapTransform(new CircleCrop())
.error(R.drawable.ic_user_default)
.placeholder(R.drawable.ic_user_default))
.into(mIvUserIcon);
mTvName.setText(UserLgUtils.getName());
String userDeptId = UserLgUtils.getUserDeptId();
LogUtils.e(userDeptId);
if (!TextUtils.isEmpty(userDeptId)) {
Gson gson = new Gson();
ArrayList<UserInfoBean.DepartmentsBean> depts = gson.fromJson(userDeptId, new TypeToken<ArrayList<UserInfoBean.DepartmentsBean>>() {
}.getType());
if (depts != null && depts.size() > 0) {
mTvDept.setText(depts.get(0).getDepartmentName());
}
}
getShowNum();
}
private void getShowNum() {
RetrofitManager.getInstance()
.create(OAApi.class)
.getMineJoinMeetingList("", "1", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<MineJoinMeetingListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull MineJoinMeetingListBean mineJoinMeetingListBean) {
mTvJoinMeetingNum.setText(mineJoinMeetingListBean.getTotal() + "");
}
@Override
public void onError(@NonNull Throwable e) {
mTvJoinMeetingNum.setText("0");
}
@Override
public void onComplete() {
}
}); //参加的会议个数
RetrofitManager.getInstance()
.create(OAApi.class)
.getMineEmceeMeetingList("", "1", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<MineJoinMeetingListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull MineJoinMeetingListBean mineJoinMeetingListBean) {
mTvEmceeMeetingNum.setText(mineJoinMeetingListBean.getTotal() + "");
}
@Override
public void onError(@NonNull Throwable e) {
mTvEmceeMeetingNum.setText("0");
}
@Override
public void onComplete() {
}
}); //主持的会议个数
//日常工作的个数
}
@Override
protected void refreshView() {
}
@Override
protected void loadMoreData() {
}
@Override
protected int getContentViewId() {
return R.layout.fragment_mine;
}
}

View File

@ -16,12 +16,18 @@
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_marginTop="5dp"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/white"
tools:itemCount="5"
tools:listitem="@layout/item_email" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<LinearLayout

View File

@ -4,8 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activity.meeting.MineMeetingListActivity">
android:orientation="vertical">
<include layout="@layout/layout_base_search_cancel" />
@ -16,12 +15,17 @@
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_marginTop="5dp"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/white"
tools:listitem="@layout/item_email" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<LinearLayout

View File

@ -4,8 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activity.meeting.MineMeetingListActivity">
android:orientation="vertical">
<include layout="@layout/layout_base_search_cancel" />
@ -16,12 +15,17 @@
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginTop="5dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
tools:itemCount="5"
tools:listitem="@layout/item_email" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<LinearLayout

View File

@ -11,17 +11,23 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_marginTop="5dp"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/white"
tools:listitem="@layout/item_email" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<LinearLayout

View File

@ -0,0 +1,297 @@
<?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="match_parent"
android:background="@color/gray_bg"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="18dp">
<ImageView
android:id="@+id/iv_user_icon"
android:layout_width="70dp"
android:layout_height="70dp"
tools:src="@drawable/ic_user_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/text_18"
tools:text="用户姓名" />
<TextView
android:id="@+id/tv_dept"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textSize="@dimen/text_14"
tools:text="用户所在部门" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
<LinearLayout
android:id="@+id/ll_join_meeting"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="参加的会议" />
<TextView
android:id="@+id/tv_join_meeting_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="@color/black"
android:textSize="@dimen/text_18"
tools:text="5" />
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/gray_bg" />
<LinearLayout
android:id="@+id/ll_emcee_meeting"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="主持的会议" />
<TextView
android:id="@+id/tv_emcee_meeting_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="@color/black"
android:textSize="@dimen/text_18"
tools:text="99+" />
</LinearLayout>
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_schedule"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_schedule_icon" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="我的日程"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_day_work"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_work_day_icon" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="日常工作"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_work_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="4" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_mine_team"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_team_mine_icon" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="我的组织"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_mine_dept"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_dept_mine_icon" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="我的部门"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_about_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_about_us_icon" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="个人档案"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_login_out"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_login_out_icon" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="退出登录"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

View File

@ -3,20 +3,21 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_f0"
android:background="@color/gray_bg"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="50dp"
android:background="@color/gray_bg"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/iv_user_icon"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_centerVertical="true"
tools:src="@drawable/ic_user_default" />
@ -26,57 +27,65 @@
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_add_cir" />
android:src="@drawable/ic_add_icon_solid" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<include layout="@layout/layout_base_search_cancel_gray" />
android:orientation="vertical"
android:paddingTop="5dp">
<include layout="@layout/layout_base_search_cancel_gray_btn" />
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center_horizontal"
android:background="@color/gray_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="我的收件箱" />
android:layout_marginTop="10dp"
android:text="我的收件箱"
android:textSize="@dimen/text_14" />
<RelativeLayout
android:id="@+id/rl_inbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_inbox_title"
android:layout_width="22dp"
android:layout_height="22dp"
android:scaleType="fitXY"
android:src="@drawable/ic_inbox_title_icon" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:drawablePadding="5dp"
android:drawableLeft="@drawable/ic_type_icon"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/iv_inbox_title"
android:text="收件箱"
android:textColor="@color/black" />
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_inbox_num"
@ -91,78 +100,125 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="25dp"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:background="@color/gray_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="文件夹" />
android:layout_marginTop="20dp"
android:text="文件夹"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_sent_box"
<LinearLayout
android:id="@+id/ll_send_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:drawablePadding="5dp"
android:clickable="true"
android:focusable="true"
android:drawableLeft="@drawable/ic_type_icon"
android:text="以发送"
android:textColor="@color/black" />
android:gravity="center_vertical"
android:orientation="horizontal">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center_horizontal"
android:background="@color/gray_bg" />
<ImageView
android:layout_width="22dp"
android:layout_height="22dp"
android:scaleType="fitXY"
android:src="@drawable/ic_send_title_icon" />
<TextView
android:id="@+id/tv_sent_box"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="以发送"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_draft_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:clickable="true"
android:focusable="true"
android:drawableLeft="@drawable/ic_type_icon"
android:drawablePadding="5dp"
android:text="草稿箱"
android:textColor="@color/black" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="5dp"
android:layout_marginLeft="25dp"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:background="@color/gray_bg" />
<TextView
android:id="@+id/tv_recycle_box"
<LinearLayout
android:id="@+id/ll_draft_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:clickable="true"
android:drawablePadding="5dp"
android:focusable="true"
android:drawableLeft="@drawable/ic_type_icon"
android:text="回收站"
android:textColor="@color/black" />
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="22dp"
android:layout_height="22dp"
android:scaleType="fitXY"
android:src="@drawable/ic_draft_title_icon" />
<TextView
android:id="@+id/tv_draft_box"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="草稿箱"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="25dp"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:background="@color/gray_bg" />
<LinearLayout
android:id="@+id/ll_recycle_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="22dp"
android:layout_height="22dp"
android:scaleType="fitXY"
android:src="@drawable/ic_recycle_title_icon" />
<TextView
android:id="@+id/tv_recycle_box"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="回收站"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="25dp"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:background="@color/gray_bg" />
</LinearLayout>
</LinearLayout>

View File

@ -64,7 +64,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true">
android:layout_centerVertical="true"
android:layout_marginRight="15dp">
<ImageView
android:id="@+id/iv_scan"

View File

@ -3,10 +3,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:background="@color/white"
android:orientation="horizontal"
android:padding="3dp">
android:paddingLeft="5dp"
android:paddingTop="10dp"
android:paddingRight="5dp"
android:paddingBottom="10dp">
<LinearLayout
android:layout_width="0dp"
@ -50,9 +52,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:drawableLeft="@drawable/ic_notify_point_gray"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="@dimen/text_16"
tools:text="标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题" />
</LinearLayout>
@ -61,10 +65,11 @@
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="7dp"
android:ellipsize="end"
android:maxLines="1"
android:textSize="12sp"
android:textSize="@dimen/text_14"
tools:text="标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题" />
</LinearLayout>