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

个人档案页面修改

Browse Source
This commit is contained in:
adam 2022-06-10 17:12:26 +08:00
parent 9708f4d8dd
commit 4a873481e9
15 changed files with 566 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
baselib/src/main/res/drawable-xhdpi/ic_type_bottom_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 B

6
baselib/src/main/res/drawable/shp_rectangle_gray_5_ee.xml Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/gray_ee" />
<corners android:radius="8dp" />
</shape>

6
baselib/src/main/res/drawable/shp_rectangle_white_10.xml Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:radius="10dp" />
</shape>

29
baselib/src/main/res/layout/layout_base_search_cancel_gray_ee_btn.xml Normal file
View File

@ -0,0 +1,29 @@
<?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:background="@drawable/shp_rectangle_gray_5_ee"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="7dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_search_icon_gray_title" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:hint="搜索"
android:imeOptions="actionSearch"
android:singleLine="true"
android:textSize="14sp" />
</LinearLayout>

4
baselib/src/main/res/values/colors.xml
View File

@ -124,6 +124,7 @@
<color name="gray_BA">#BABABA</color> <color name="gray_BA">#BABABA</color>
<color name="gray_db">#D8D8D8</color> <color name="gray_db">#D8D8D8</color>
<color name="gray_bb">#9CBBBBBB</color> <color name="gray_bb">#9CBBBBBB</color>
<color name="gray_bb12">#1FBBBBBB</color>
<color name="red_ff">#FF0000</color> <color name="red_ff">#FF0000</color>
<color name="orange">#FF6300</color> <color name="orange">#FF6300</color>
<color name="home_background">#f5f5f5</color> <color name="home_background">#f5f5f5</color>
@ -137,6 +138,7 @@
<color name="sifazhuanti_bg">#f4f4f4</color> <color name="sifazhuanti_bg">#f4f4f4</color>
<color name="other">#6E7B8B</color> <color name="other">#6E7B8B</color>
<color name="huiyi_title_color">#535353</color> <color name="huiyi_title_color">#535353</color>
<color name="gray_a9">#A9ABAE</color>
<color name="nomal">#1583F4</color><!--正常--> <color name="nomal">#1583F4</color><!--正常-->
<color name="evection">#0DEB00</color><!--公出--> <color name="evection">#0DEB00</color><!--公出-->
<color name="vacation">#15E8F1</color><!--请假--> <color name="vacation">#15E8F1</color><!--请假-->
@ -170,10 +172,12 @@
<color name="gray_4edf">#4EDFDFDF</color> <color name="gray_4edf">#4EDFDFDF</color>
<color name="gray_ef">#efeff4</color> <color name="gray_ef">#efeff4</color>
<color name="gray_f8">#F8F8F8</color> <color name="gray_f8">#F8F8F8</color>
<color name="gray_80">#808080</color>
<color name="gray_f2">#F2F2F2</color> <color name="gray_f2">#F2F2F2</color>
<color name="line">#efefef</color> <color name="line">#efefef</color>
<color name="gray_f5">#F5F5F5</color> <color name="gray_f5">#F5F5F5</color>
<color name="gray_dd">#E7E7E7</color> <color name="gray_dd">#E7E7E7</color>
<color name="gray_ee">#EEEEEE</color>
<color name="gray_f7">#F7F7F7</color> <color name="gray_f7">#F7F7F7</color>
<color name="gray_tr_hint">#aa000000</color> <color name="gray_tr_hint">#aa000000</color>

2
mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java
View File

@ -322,7 +322,7 @@ public class MainTabActivity extends BaseActivity {
mVStatusBar.setVisibility(View.VISIBLE); mVStatusBar.setVisibility(View.VISIBLE);
ImmersionBar.with(this) ImmersionBar.with(this)
.statusBarColor(R.color.gray_f8) .statusBarColor(R.color.white)
.statusBarDarkFont(true) .statusBarDarkFont(true)
.titleBar(mVStatusBar) .titleBar(mVStatusBar)
.init(); .init();

44
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordAddActivity.java
View File

@ -7,9 +7,8 @@ import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
@ -39,6 +38,7 @@ import com.tenlionsoft.baselib.core.widget.base.AddFileAdapter;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.core.widget.chat.GlideEngine; import com.tenlionsoft.baselib.core.widget.chat.GlideEngine;
import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider; import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
import com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView;
import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.FileUtils; import com.tenlionsoft.baselib.utils.FileUtils;
import com.tenlionsoft.baselib.utils.RegexUtils; import com.tenlionsoft.baselib.utils.RegexUtils;
@ -65,7 +65,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
@ -90,8 +89,6 @@ import okhttp3.RequestBody;
public class UserRecordAddActivity extends BaseActivity { public class UserRecordAddActivity extends BaseActivity {
@BindView(R2.id.rg_type)
RadioGroup mRgType;
@BindView(R2.id.et_name) @BindView(R2.id.et_name)
EditText mEtName; EditText mEtName;
@BindView(R2.id.tv_gender) @BindView(R2.id.tv_gender)
@ -156,10 +153,6 @@ public class UserRecordAddActivity extends BaseActivity {
TextView mTvPersionType; TextView mTvPersionType;
@BindView(R2.id.ll_job) @BindView(R2.id.ll_job)
LinearLayout mLlJob; LinearLayout mLlJob;
@BindView(R2.id.rb_base)
RadioButton mRbBase;
@BindView(R2.id.rb_job)
RadioButton mRbJob;
@BindView(R2.id.btn_add_educate) @BindView(R2.id.btn_add_educate)
Button mBtnAddEducate; Button mBtnAddEducate;
@BindView(R2.id.rlv_educate) @BindView(R2.id.rlv_educate)
@ -176,6 +169,18 @@ public class UserRecordAddActivity extends BaseActivity {
RecyclerView mRlvResumeFile; RecyclerView mRlvResumeFile;
@BindView(R2.id.rlv_imgs) @BindView(R2.id.rlv_imgs)
RecyclerView mRlvImgs; RecyclerView mRlvImgs;
@BindView(R2.id.tv_type_base)
TypeFaceTextView mTvTypeBase;
@BindView(R2.id.iv_type_base)
ImageView mIvTypeBase;
@BindView(R2.id.ll_type_base)
LinearLayout mLlTypeBase;
@BindView(R2.id.tv_type_job)
TypeFaceTextView mTvTypeJob;
@BindView(R2.id.iv_type_job)
ImageView mIvTypeJob;
@BindView(R2.id.ll_type_job)
LinearLayout mLlTypeJob;
//性别 //性别
private List<DicBean> mGenderList; private List<DicBean> mGenderList;
@ -253,14 +258,23 @@ public class UserRecordAddActivity extends BaseActivity {
mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("保存"); mTvPublish.setText("保存");
mTvPublish.setOnClickListener(v -> doSaveRecord()); mTvPublish.setOnClickListener(v -> doSaveRecord());
mRgType.setOnCheckedChangeListener((v, i) -> { //个人简历
if (i == R.id.rb_base) { mLlTypeBase.setOnClickListener(v -> {
mLlBase.setVisibility(View.VISIBLE); mLlBase.setVisibility(View.VISIBLE);
mLlJob.setVisibility(View.GONE); mLlJob.setVisibility(View.GONE);
} else if (i == R.id.rb_job) { mTvTypeBase.setTextColor(getResources().getColor(R.color.black_10));
mTvTypeJob.setTextColor(getResources().getColor(R.color.gray_a9));
mIvTypeBase.setVisibility(View.VISIBLE);
mIvTypeJob.setVisibility(View.INVISIBLE);
});
//工作简历
mLlTypeJob.setOnClickListener(v -> {
mLlBase.setVisibility(View.GONE); mLlBase.setVisibility(View.GONE);
mLlJob.setVisibility(View.VISIBLE); mLlJob.setVisibility(View.VISIBLE);
} mTvTypeBase.setTextColor(getResources().getColor(R.color.gray_a9));
mTvTypeJob.setTextColor(getResources().getColor(R.color.black_10));
mIvTypeBase.setVisibility(View.INVISIBLE);
mIvTypeJob.setVisibility(View.VISIBLE);
}); });
mTvGender.setOnClickListener(v -> onShowGender()); mTvGender.setOnClickListener(v -> onShowGender());
mTvPolitical.setOnClickListener(v -> onShowPolitical()); mTvPolitical.setOnClickListener(v -> onShowPolitical());
@ -344,7 +358,7 @@ public class UserRecordAddActivity extends BaseActivity {
mImgList = new ArrayList<>(); mImgList = new ArrayList<>();
mImgList.add(new AddFileBean()); mImgList.add(new AddFileBean());
mImgAdapter = new AddFileAdapter(mActivity, mImgList); mImgAdapter = new AddFileAdapter(mActivity, mImgList);
mRlvImgs.setLayoutManager(new GridLayoutManager(mActivity, 5)); mRlvImgs.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvImgs.setAdapter(mImgAdapter); mRlvImgs.setAdapter(mImgAdapter);
mImgAdapter.addOnItemClickListener(addFileBean -> { mImgAdapter.addOnItemClickListener(addFileBean -> {
if (TextUtils.isEmpty(addFileBean.getId())) { if (TextUtils.isEmpty(addFileBean.getId())) {
@ -394,7 +408,7 @@ public class UserRecordAddActivity extends BaseActivity {
mFileAdapter.notifyDataSetChanged(); mFileAdapter.notifyDataSetChanged();
++mFileMax; ++mFileMax;
}); });
mRlvResumeFile.setLayoutManager(new GridLayoutManager(mActivity, 5)); mRlvResumeFile.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvResumeFile.setAdapter(mFileAdapter); mRlvResumeFile.setAdapter(mFileAdapter);
} }

44
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java
View File

@ -6,9 +6,8 @@ import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
@ -24,11 +23,11 @@ import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.AddFileAdapter; import com.tenlionsoft.baselib.core.widget.base.AddFileAdapter;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider; import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
import com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView;
import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.FileUtils; import com.tenlionsoft.baselib.utils.FileUtils;
import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UIUtil;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.adapter.EducateAdapter; import com.tenlionsoft.oamodule.adapter.EducateAdapter;
@ -60,12 +59,6 @@ import static com.tenlionsoft.baselib.core.widget.PhotoActivity.TAG_IMGURL;
@Route(path = PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_DETAIL) @Route(path = PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_DETAIL)
public class UserRecordDetailActivity extends BaseActivity { public class UserRecordDetailActivity extends BaseActivity {
@BindView(R2.id.rb_base)
RadioButton mRbBase;
@BindView(R2.id.rb_job)
RadioButton mRbJob;
@BindView(R2.id.rg_type)
RadioGroup mRgType;
@BindView(R2.id.tv_name) @BindView(R2.id.tv_name)
TextView mTvName; TextView mTvName;
@BindView(R2.id.tv_gender) @BindView(R2.id.tv_gender)
@ -142,6 +135,18 @@ public class UserRecordDetailActivity extends BaseActivity {
TextView mTvResumeHint; TextView mTvResumeHint;
@BindView(R2.id.rlv_imgs) @BindView(R2.id.rlv_imgs)
RecyclerView mRlvImgs; RecyclerView mRlvImgs;
@BindView(R2.id.tv_type_base)
TypeFaceTextView mTvTypeBase;
@BindView(R2.id.iv_type_base)
ImageView mIvTypeBase;
@BindView(R2.id.ll_type_base)
LinearLayout mLlTypeBase;
@BindView(R2.id.tv_type_job)
TypeFaceTextView mTvTypeJob;
@BindView(R2.id.iv_type_job)
ImageView mIvTypeJob;
@BindView(R2.id.ll_type_job)
LinearLayout mLlTypeJob;
@Override @Override
protected int setLayoutId() { protected int setLayoutId() {
@ -152,14 +157,23 @@ public class UserRecordDetailActivity extends BaseActivity {
public void initData() { public void initData() {
ButterKnife.bind(this); ButterKnife.bind(this);
mTvBaseTitle.setText("个人档案"); mTvBaseTitle.setText("个人档案");
mRgType.setOnCheckedChangeListener((v, id) -> { //个人简历
if (id == R.id.rb_base) { mLlTypeBase.setOnClickListener(v -> {
mLlBase.setVisibility(View.VISIBLE); mLlBase.setVisibility(View.VISIBLE);
mLlJob.setVisibility(View.GONE); mLlJob.setVisibility(View.GONE);
} else if (id == R.id.rb_job) { mTvTypeBase.setTextColor(getResources().getColor(R.color.black_10));
mTvTypeJob.setTextColor(getResources().getColor(R.color.gray_a9));
mIvTypeBase.setVisibility(View.VISIBLE);
mIvTypeJob.setVisibility(View.INVISIBLE);
});
//工作简历
mLlTypeJob.setOnClickListener(v -> {
mLlBase.setVisibility(View.GONE); mLlBase.setVisibility(View.GONE);
mLlJob.setVisibility(View.VISIBLE); mLlJob.setVisibility(View.VISIBLE);
} mTvTypeBase.setTextColor(getResources().getColor(R.color.gray_a9));
mTvTypeJob.setTextColor(getResources().getColor(R.color.black_10));
mIvTypeBase.setVisibility(View.INVISIBLE);
mIvTypeJob.setVisibility(View.VISIBLE);
}); });
getDetailData(); getDetailData();
} }
@ -214,9 +228,7 @@ public class UserRecordDetailActivity extends BaseActivity {
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_ADD) .build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_ADD)
.navigation(mActivity, 12); .navigation(mActivity, 12);
}) })
.setNegativeButton("取消", (dialog, which) -> { .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
dialog.dismiss();
})
.create() .create()
.show(); .show();
} }

53
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordEditActivity.java
View File

@ -8,9 +8,8 @@ import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
@ -41,6 +40,7 @@ import com.tenlionsoft.baselib.core.widget.base.AddFileAdapter;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.core.widget.chat.GlideEngine; import com.tenlionsoft.baselib.core.widget.chat.GlideEngine;
import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider; import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
import com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView;
import com.tenlionsoft.baselib.utils.ExceptionHandler; import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.FileUtils; import com.tenlionsoft.baselib.utils.FileUtils;
import com.tenlionsoft.baselib.utils.RegexUtils; import com.tenlionsoft.baselib.utils.RegexUtils;
@ -68,7 +68,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
@ -93,8 +92,6 @@ import okhttp3.RequestBody;
public class UserRecordEditActivity extends BaseActivity { public class UserRecordEditActivity extends BaseActivity {
@BindView(R2.id.rg_type)
RadioGroup mRgType;
@BindView(R2.id.et_name) @BindView(R2.id.et_name)
EditText mEtName; EditText mEtName;
@BindView(R2.id.tv_gender) @BindView(R2.id.tv_gender)
@ -163,10 +160,6 @@ public class UserRecordEditActivity extends BaseActivity {
RecyclerView mRlvResumeFile; RecyclerView mRlvResumeFile;
@BindView(R2.id.ll_job) @BindView(R2.id.ll_job)
LinearLayout mLlJob; LinearLayout mLlJob;
@BindView(R2.id.rb_base)
RadioButton mRbBase;
@BindView(R2.id.rb_job)
RadioButton mRbJob;
@BindView(R2.id.btn_del) @BindView(R2.id.btn_del)
Button mBtnDel; Button mBtnDel;
@BindView(R2.id.rlv_imgs) @BindView(R2.id.rlv_imgs)
@ -181,6 +174,18 @@ public class UserRecordEditActivity extends BaseActivity {
Button mBtnAddResume; Button mBtnAddResume;
@BindView(R2.id.tv_resume_int) @BindView(R2.id.tv_resume_int)
TextView mTvResumeInt; TextView mTvResumeInt;
@BindView(R2.id.tv_type_base)
TypeFaceTextView mTvTypeBase;
@BindView(R2.id.iv_type_base)
ImageView mIvTypeBase;
@BindView(R2.id.ll_type_base)
LinearLayout mLlTypeBase;
@BindView(R2.id.tv_type_job)
TypeFaceTextView mTvTypeJob;
@BindView(R2.id.iv_type_job)
ImageView mIvTypeJob;
@BindView(R2.id.ll_type_job)
LinearLayout mLlTypeJob;
//性别 //性别
private List<DicBean> mGenderList; private List<DicBean> mGenderList;
@ -471,14 +476,24 @@ public class UserRecordEditActivity extends BaseActivity {
mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("保存"); mTvPublish.setText("保存");
mTvPublish.setOnClickListener(v -> doSaveRecord()); mTvPublish.setOnClickListener(v -> doSaveRecord());
mRgType.setOnCheckedChangeListener((v, i) -> {
if (i == R.id.rb_base) { //个人简历
mLlTypeBase.setOnClickListener(v -> {
mLlBase.setVisibility(View.VISIBLE); mLlBase.setVisibility(View.VISIBLE);
mLlJob.setVisibility(View.GONE); mLlJob.setVisibility(View.GONE);
} else if (i == R.id.rb_job) { mTvTypeBase.setTextColor(getResources().getColor(R.color.black_10));
mTvTypeJob.setTextColor(getResources().getColor(R.color.gray_a9));
mIvTypeBase.setVisibility(View.VISIBLE);
mIvTypeJob.setVisibility(View.INVISIBLE);
});
//工作简历
mLlTypeJob.setOnClickListener(v -> {
mLlBase.setVisibility(View.GONE); mLlBase.setVisibility(View.GONE);
mLlJob.setVisibility(View.VISIBLE); mLlJob.setVisibility(View.VISIBLE);
} mTvTypeBase.setTextColor(getResources().getColor(R.color.gray_a9));
mTvTypeJob.setTextColor(getResources().getColor(R.color.black_10));
mIvTypeBase.setVisibility(View.INVISIBLE);
mIvTypeJob.setVisibility(View.VISIBLE);
}); });
mTvGender.setOnClickListener(v -> onShowGender()); mTvGender.setOnClickListener(v -> onShowGender());
mTvPolitical.setOnClickListener(v -> onShowPolitical()); mTvPolitical.setOnClickListener(v -> onShowPolitical());
@ -523,7 +538,7 @@ public class UserRecordEditActivity extends BaseActivity {
if (mEducateDetailBeans.size() > 0) { if (mEducateDetailBeans.size() > 0) {
mTvEducateInt.setVisibility(View.GONE); mTvEducateInt.setVisibility(View.GONE);
} else { } else {
mTvEducateInt.setVisibility(View.GONE); mTvEducateInt.setVisibility(View.VISIBLE);
} }
} }
@ -547,7 +562,7 @@ public class UserRecordEditActivity extends BaseActivity {
if (mResumeBeans.size() > 0) { if (mResumeBeans.size() > 0) {
mTvResumeInt.setVisibility(View.GONE); mTvResumeInt.setVisibility(View.GONE);
} else { } else {
mTvResumeInt.setVisibility(View.GONE); mTvResumeInt.setVisibility(View.VISIBLE);
} }
} }
@ -562,7 +577,7 @@ public class UserRecordEditActivity extends BaseActivity {
mImgList = new ArrayList<>(); mImgList = new ArrayList<>();
mImgList.add(new AddFileBean()); mImgList.add(new AddFileBean());
mImgAdapter = new AddFileAdapter(mActivity, mImgList); mImgAdapter = new AddFileAdapter(mActivity, mImgList);
mRlvImgs.setLayoutManager(new GridLayoutManager(mActivity, 5)); mRlvImgs.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvImgs.setAdapter(mImgAdapter); mRlvImgs.setAdapter(mImgAdapter);
mImgAdapter.addOnItemClickListener(addFileBean -> { mImgAdapter.addOnItemClickListener(addFileBean -> {
if (TextUtils.isEmpty(addFileBean.getId())) { if (TextUtils.isEmpty(addFileBean.getId())) {
@ -609,7 +624,7 @@ public class UserRecordEditActivity extends BaseActivity {
mFileAdapter.notifyDataSetChanged(); mFileAdapter.notifyDataSetChanged();
++mFileMax; ++mFileMax;
}); });
mRlvResumeFile.setLayoutManager(new GridLayoutManager(mActivity, 5)); mRlvResumeFile.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvResumeFile.setAdapter(mFileAdapter); mRlvResumeFile.setAdapter(mFileAdapter);
mBtnDel.setOnClickListener(v -> onShowConfirm()); mBtnDel.setOnClickListener(v -> onShowConfirm());
} }
@ -1314,8 +1329,8 @@ public class UserRecordEditActivity extends BaseActivity {
bean.setIdCard(idcard);//身份证号 bean.setIdCard(idcard);//身份证号
bean.setPoliticalOutlook(mSelPolitical.getDataId());//政治面貌 bean.setPoliticalOutlook(mSelPolitical.getDataId());//政治面貌
bean.setMaritalStatus(mSelMarital.getDataId());//婚姻状况 bean.setMaritalStatus(mSelMarital.getDataId());//婚姻状况
String nationality = mEtNationality.getText().toString().trim(); // String nationality = mEtNationality.getText().toString().trim();
bean.setNationality(nationality);//国籍 // bean.setNationality(nationality);//国籍
String nativePlace = mEtNativePlace.getText().toString().trim(); String nativePlace = mEtNativePlace.getText().toString().trim();
bean.setNativeAddress(nativePlace);//籍贯 bean.setNativeAddress(nativePlace);//籍贯
String passport = mEtPassport.getText().toString().trim(); String passport = mEtPassport.getText().toString().trim();

230
oamodule/src/main/res/layout/activity_user_record_add.xml
View File

@ -3,54 +3,80 @@
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_f7"
android:orientation="vertical" android:orientation="vertical"
tools:context=".activity.record.UserRecordAddActivity"> tools:context=".activity.record.UserRecordAddActivity">
<RadioGroup <RelativeLayout
android:id="@+id/rg_type" android:layout_width="match_parent"
android:layout_height="wrap_content">
<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:layout_marginLeft="10dp"
android:orientation="horizontal"> android:layout_marginRight="10dp"
android:orientation="horizontal"
android:padding="5dp">
<LinearLayout
<RadioButton android:id="@+id/ll_type_base"
android:id="@+id/rb_base"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/switch_custom_white_gray" android:orientation="vertical">
android:button="@null"
android:checked="true" <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:gravity="center" android:id="@+id/tv_type_base"
android:paddingLeft="15dp" android:layout_width="wrap_content"
android:paddingTop="10dp" android:layout_height="wrap_content"
android:paddingRight="15dp" android:layout_gravity="center_vertical"
android:paddingBottom="10dp"
android:text="基础信息" android:text="基础信息"
android:textSize="@dimen/text_16" android:textSize="14sp" />
android:textStyle="bold" />
<RadioButton <ImageView
android:id="@+id/rb_job" android:id="@+id/iv_type_base"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_type_bottom_icon" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_type_job"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/switch_custom_white_gray" android:layout_marginLeft="15dp"
android:button="@null" android:orientation="vertical">
android:gravity="center"
android:paddingLeft="15dp" <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:paddingTop="10dp" android:id="@+id/tv_type_job"
android:paddingRight="15dp" android:layout_width="wrap_content"
android:paddingBottom="10dp" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="入职信息" android:text="入职信息"
android:textSize="@dimen/text_16" android:textColor="@color/gray_a9"
android:textStyle="bold" /> android:textSize="14sp" />
</RadioGroup>
<ImageView
android:id="@+id/iv_type_job"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_type_bottom_icon"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<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:background="@color/gray_f8" android:layout_margin="10dp"
android:background="@drawable/shp_rectangle_white_10"
android:paddingTop="10dp"
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
@ -64,12 +90,30 @@
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"
tools:visibility="gone"> tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:padding="5dp"
android:text="证件照"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_imgs" android:id="@+id/rlv_imgs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -89,7 +133,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入姓名" android:hint="请输入姓名"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -109,11 +153,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -133,11 +178,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -160,7 +206,7 @@
android:digits="@string/limit_id_card" android:digits="@string/limit_id_card"
android:gravity="right" android:gravity="right"
android:hint="请输入身份证号码" android:hint="请输入身份证号码"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -180,11 +226,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -204,15 +251,18 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout
style="@style/item_hor_content"
android:visibility="gone">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -230,7 +280,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入国籍" android:hint="请输入国籍"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -252,7 +302,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入籍贯" android:hint="请输入籍贯"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -274,7 +324,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入户口" android:hint="请输入户口"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -294,11 +344,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -320,7 +371,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入家庭地址" android:hint="请输入家庭地址"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -342,7 +393,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入电子邮箱" android:hint="请输入电子邮箱"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -365,6 +416,7 @@
android:digits="@string/limit_phone" android:digits="@string/limit_phone"
android:gravity="right" android:gravity="right"
android:hint="请输入联系电话" android:hint="请输入联系电话"
android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -386,7 +438,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入毕业院校" android:hint="请输入毕业院校"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -406,11 +458,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -433,7 +486,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入最高学位" android:hint="请输入最高学位"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -453,11 +506,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -479,7 +533,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入紧急联系人" android:hint="请输入紧急联系人"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -502,7 +556,7 @@
android:digits="@string/limit_phone" android:digits="@string/limit_phone"
android:gravity="right" android:gravity="right"
android:hint="请输入紧急联系人联系电话" android:hint="请输入紧急联系人联系电话"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -532,11 +586,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -557,11 +612,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -581,11 +637,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -605,11 +662,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -629,11 +687,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -655,7 +714,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入银行账号" android:hint="请输入银行账号"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -677,7 +736,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入公积金号" android:hint="请输入公积金号"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -699,7 +758,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入社保卡号" android:hint="请输入社保卡号"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -719,11 +778,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -743,11 +803,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -767,18 +828,21 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</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:orientation="vertical"> android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -805,7 +869,8 @@
android:background="@drawable/sel_btn_submit" android:background="@drawable/sel_btn_submit"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:padding="3dp" android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="添加教育经历" android:text="添加教育经历"
android:textColor="@color/white" /> android:textColor="@color/white" />
</RelativeLayout> </RelativeLayout>
@ -833,7 +898,9 @@
<LinearLayout <LinearLayout
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:paddingLeft="10dp"
android:paddingRight="10dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -860,7 +927,8 @@
android:background="@drawable/sel_btn_submit" android:background="@drawable/sel_btn_submit"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:padding="3dp" android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="添加工作简历" android:text="添加工作简历"
android:textColor="@color/white" /> android:textColor="@color/white" />
</RelativeLayout> </RelativeLayout>

155
oamodule/src/main/res/layout/activity_user_record_detail.xml
View File

@ -3,54 +3,75 @@
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_f7"
android:orientation="vertical" android:orientation="vertical"
tools:context=".activity.record.UserRecordAddActivity"> tools:context=".activity.record.UserRecordAddActivity">
<RadioGroup
android:id="@+id/rg_type" <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:layout_marginLeft="10dp"
android:orientation="horizontal"> android:layout_marginRight="10dp"
android:orientation="horizontal"
android:padding="5dp">
<LinearLayout
<RadioButton android:id="@+id/ll_type_base"
android:id="@+id/rb_base"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/switch_custom_white_gray" android:orientation="vertical">
android:button="@null"
android:checked="true" <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:gravity="center" android:id="@+id/tv_type_base"
android:paddingLeft="15dp" android:layout_width="wrap_content"
android:paddingTop="10dp" android:layout_height="wrap_content"
android:paddingRight="15dp" android:layout_gravity="center_vertical"
android:paddingBottom="10dp"
android:text="基础信息" android:text="基础信息"
android:textSize="@dimen/text_16" android:textSize="14sp" />
android:textStyle="bold" />
<RadioButton <ImageView
android:id="@+id/rb_job" android:id="@+id/iv_type_base"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_type_bottom_icon" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_type_job"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/switch_custom_white_gray" android:layout_marginLeft="15dp"
android:button="@null" android:orientation="vertical">
android:gravity="center"
android:paddingLeft="15dp" <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:paddingTop="10dp" android:id="@+id/tv_type_job"
android:paddingRight="15dp" android:layout_width="wrap_content"
android:paddingBottom="10dp" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="入职信息" android:text="入职信息"
android:textSize="@dimen/text_16" android:textColor="@color/gray_a9"
android:textStyle="bold" /> android:textSize="14sp" />
</RadioGroup>
<ImageView
android:id="@+id/iv_type_job"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_type_bottom_icon"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
<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:background="@color/gray_f8" android:layout_margin="10dp"
android:background="@drawable/shp_rectangle_white_10"
android:paddingTop="10dp"
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
@ -64,7 +85,7 @@
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"
tools:visibility="gone"> tools:visibility="visible">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_imgs" android:id="@+id/rlv_imgs"
@ -89,7 +110,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -112,7 +133,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -135,7 +156,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -158,7 +179,7 @@
android:digits="@string/limit_id_card" android:digits="@string/limit_id_card"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -181,7 +202,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -204,11 +225,13 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout
style="@style/item_hor_content"
android:visibility="gone">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -226,7 +249,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -248,7 +271,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -270,7 +293,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -293,7 +316,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -315,7 +338,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -337,7 +360,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -360,7 +383,7 @@
android:digits="@string/limit_phone" android:digits="@string/limit_phone"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -382,7 +405,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -403,7 +426,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -426,7 +449,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -447,7 +470,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -469,7 +492,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -491,7 +514,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -524,7 +547,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -548,7 +571,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -571,7 +594,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -594,7 +617,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -617,7 +640,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -639,7 +662,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -661,7 +684,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -683,7 +706,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -706,7 +729,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -729,7 +752,7 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -752,14 +775,16 @@
android:focusable="true" android:focusable="true"
android:gravity="right" android:gravity="right"
android:hint="未录入" android:hint="未录入"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</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:layout_marginLeft="10dp"
android:layout_marginTop="2dp"
android:layout_marginRight="10dp"
android:orientation="vertical"> android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
@ -792,7 +817,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:orientation="vertical"> android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView

224
oamodule/src/main/res/layout/activity_user_record_edit.xml
View File

@ -3,53 +3,71 @@
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_f7"
android:orientation="vertical" android:orientation="vertical"
tools:context=".activity.record.UserRecordAddActivity"> tools:context=".activity.record.UserRecordAddActivity">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:background="@color/white">
<RadioGroup <LinearLayout
android:id="@+id/rg_type" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal"
android:padding="5dp">
<LinearLayout
android:id="@+id/ll_type_base"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
<RadioButton android:id="@+id/tv_type_base"
android:id="@+id/rb_base"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/switch_custom_white_gray" android:layout_gravity="center_vertical"
android:button="@null"
android:checked="true"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingTop="10dp"
android:paddingRight="15dp"
android:paddingBottom="10dp"
android:text="基础信息" android:text="基础信息"
android:textSize="@dimen/text_16" android:textSize="14sp" />
android:textStyle="bold" />
<RadioButton <ImageView
android:id="@+id/rb_job" android:id="@+id/iv_type_base"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_type_bottom_icon" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_type_job"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/switch_custom_white_gray" android:layout_marginLeft="15dp"
android:button="@null" android:orientation="vertical">
android:gravity="center"
android:paddingLeft="15dp" <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:paddingTop="10dp" android:id="@+id/tv_type_job"
android:paddingRight="15dp" android:layout_width="wrap_content"
android:paddingBottom="10dp" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="入职信息" android:text="入职信息"
android:textSize="@dimen/text_16" android:textColor="@color/gray_a9"
android:textStyle="bold" /> android:textSize="14sp" />
</RadioGroup>
<ImageView
android:id="@+id/iv_type_job"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_type_bottom_icon"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
<Button <Button
android:id="@+id/btn_del" android:id="@+id/btn_del"
@ -61,9 +79,9 @@
android:background="@drawable/sel_btn_gray_white_round" android:background="@drawable/sel_btn_gray_white_round"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:paddingLeft="10dp" android:paddingLeft="15dp"
android:paddingTop="3dp" android:paddingTop="3dp"
android:paddingRight="10dp" android:paddingRight="15dp"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:text="删除" android:text="删除"
android:textColor="@color/col_white_gray_press" /> android:textColor="@color/col_white_gray_press" />
@ -72,7 +90,9 @@
<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:background="@color/gray_f8" android:layout_margin="10dp"
android:background="@drawable/shp_rectangle_white_10"
android:paddingTop="10dp"
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
@ -86,12 +106,30 @@
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"
tools:visibility="gone"> tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="vertical">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:padding="5dp"
android:text="证件照"
android:textColor="@color/black"
android:textSize="@dimen/text_14" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_imgs" android:id="@+id/rlv_imgs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -111,7 +149,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入姓名" android:hint="请输入姓名"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -131,11 +169,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -155,11 +194,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -182,7 +222,7 @@
android:digits="@string/limit_id_card" android:digits="@string/limit_id_card"
android:gravity="right" android:gravity="right"
android:hint="请输入身份证号码" android:hint="请输入身份证号码"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -202,11 +242,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -226,15 +267,18 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/item_hor_content"> <LinearLayout
style="@style/item_hor_content"
android:visibility="gone">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -252,7 +296,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入国籍" android:hint="请输入国籍"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -274,7 +318,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入籍贯" android:hint="请输入籍贯"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -296,7 +340,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入户口" android:hint="请输入户口"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -316,11 +360,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -342,7 +387,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入家庭地址" android:hint="请输入家庭地址"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -364,7 +409,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入电子邮箱" android:hint="请输入电子邮箱"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -387,6 +432,7 @@
android:digits="@string/limit_phone" android:digits="@string/limit_phone"
android:gravity="right" android:gravity="right"
android:hint="请输入联系电话" android:hint="请输入联系电话"
android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -408,7 +454,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入毕业院校" android:hint="请输入毕业院校"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -428,11 +474,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -455,7 +502,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入最高学位" android:hint="请输入最高学位"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -475,11 +522,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -501,7 +549,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入紧急联系人" android:hint="请输入紧急联系人"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -524,7 +572,7 @@
android:digits="@string/limit_phone" android:digits="@string/limit_phone"
android:gravity="right" android:gravity="right"
android:hint="请输入紧急联系人联系电话" android:hint="请输入紧急联系人联系电话"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -554,11 +602,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -579,11 +628,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -603,11 +653,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -627,11 +678,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -651,11 +703,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -677,7 +730,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入银行账号" android:hint="请输入银行账号"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -699,7 +752,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入公积金号" android:hint="请输入公积金号"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -721,7 +774,7 @@
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入社保卡号" android:hint="请输入社保卡号"
android:textColor="@color/black" android:textColor="@color/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -741,11 +794,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -765,11 +819,12 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -789,18 +844,21 @@
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/gray_80"
android:textSize="14sp" /> android:textSize="14sp" />
</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:orientation="vertical"> android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -856,7 +914,9 @@
<LinearLayout <LinearLayout
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:paddingLeft="10dp"
android:paddingRight="10dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

11
oamodule/src/main/res/layout/fragment_mine.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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" 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"
@ -73,6 +74,7 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/text_18" android:textSize="@dimen/text_18"
app:text_type_cus="2"
tools:text="5" /> tools:text="5" />
</LinearLayout> </LinearLayout>
@ -102,6 +104,7 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/text_18" android:textSize="@dimen/text_18"
app:text_type_cus="2"
tools:text="99+" /> tools:text="99+" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -110,7 +113,7 @@
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="7dp"
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
@ -185,7 +188,7 @@
android:id="@+id/ll_mine_team" android:id="@+id/ll_mine_team"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="7dp"
android:background="@color/white" android:background="@color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
@ -240,7 +243,7 @@
android:id="@+id/ll_about_us" android:id="@+id/ll_about_us"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="7dp"
android:background="@color/white" android:background="@color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
@ -268,7 +271,7 @@
android:id="@+id/ll_login_out" android:id="@+id/ll_login_out"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="7dp"
android:background="@color/white" android:background="@color/white"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"

13
oamodule/src/main/res/layout/fragment_oa_email.xml
View File

@ -33,11 +33,10 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp"> android:paddingTop="5dp">
<include layout="@layout/layout_base_search_cancel_gray_btn" /> <include layout="@layout/layout_base_search_cancel_gray_ee_btn" />
<LinearLayout <LinearLayout
android:id="@+id/ll_content" android:id="@+id/ll_content"
@ -86,6 +85,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:textColor="#A9ABAE"
tools:text="22" /> tools:text="22" />
</RelativeLayout> </RelativeLayout>
@ -97,7 +98,7 @@
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@color/gray_bg" /> android:background="@color/gray_bb12" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -140,7 +141,7 @@
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@color/gray_bg" /> android:background="@color/gray_bb12" />
<LinearLayout <LinearLayout
android:id="@+id/ll_draft_box" android:id="@+id/ll_draft_box"
@ -176,7 +177,7 @@
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@color/gray_bg" /> android:background="@color/gray_bb12" />
<LinearLayout <LinearLayout
android:id="@+id/ll_recycle_box" android:id="@+id/ll_recycle_box"
@ -212,7 +213,7 @@
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="@color/gray_bg" /> android:background="@color/gray_bb12" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -145,7 +145,9 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="3dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingBottom="3dp"
android:text="删除" android:text="删除"
android:textColor="@color/col_white_gray_press" /> android:textColor="@color/col_white_gray_press" />
@ -159,7 +161,9 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="3dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingBottom="3dp"
android:text="编辑" android:text="编辑"
android:textColor="@color/col_white_gray_press" /> android:textColor="@color/col_white_gray_press" />
</LinearLayout> </LinearLayout>