diff --git a/baselib/src/main/res/drawable-xhdpi/ic_type_bottom_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_type_bottom_icon.png new file mode 100644 index 0000000..466f684 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_type_bottom_icon.png differ diff --git a/baselib/src/main/res/drawable/shp_rectangle_gray_5_ee.xml b/baselib/src/main/res/drawable/shp_rectangle_gray_5_ee.xml new file mode 100755 index 0000000..edd25c4 --- /dev/null +++ b/baselib/src/main/res/drawable/shp_rectangle_gray_5_ee.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/drawable/shp_rectangle_white_10.xml b/baselib/src/main/res/drawable/shp_rectangle_white_10.xml new file mode 100755 index 0000000..effbe27 --- /dev/null +++ b/baselib/src/main/res/drawable/shp_rectangle_white_10.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/layout_base_search_cancel_gray_ee_btn.xml b/baselib/src/main/res/layout/layout_base_search_cancel_gray_ee_btn.xml new file mode 100644 index 0000000..08ddad4 --- /dev/null +++ b/baselib/src/main/res/layout/layout_base_search_cancel_gray_ee_btn.xml @@ -0,0 +1,29 @@ + + + + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/values/colors.xml b/baselib/src/main/res/values/colors.xml index cb8565f..765407d 100755 --- a/baselib/src/main/res/values/colors.xml +++ b/baselib/src/main/res/values/colors.xml @@ -124,6 +124,7 @@ #BABABA #D8D8D8 #9CBBBBBB + #1FBBBBBB #FF0000 #FF6300 #f5f5f5 @@ -137,6 +138,7 @@ #f4f4f4 #6E7B8B #535353 + #A9ABAE #1583F4 #0DEB00 #15E8F1 @@ -170,10 +172,12 @@ #4EDFDFDF #efeff4 #F8F8F8 + #808080 #F2F2F2 #efefef #F5F5F5 #E7E7E7 + #EEEEEE #F7F7F7 #aa000000 diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index 67302b4..889ba0e 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -322,7 +322,7 @@ public class MainTabActivity extends BaseActivity { mVStatusBar.setVisibility(View.VISIBLE); ImmersionBar.with(this) - .statusBarColor(R.color.gray_f8) + .statusBarColor(R.color.white) .statusBarDarkFont(true) .titleBar(mVStatusBar) .init(); diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordAddActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordAddActivity.java index 3a470db..1e5c53b 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordAddActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordAddActivity.java @@ -7,9 +7,8 @@ import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RadioButton; -import android.widget.RadioGroup; import android.widget.TextView; 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.chat.GlideEngine; 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.FileUtils; import com.tenlionsoft.baselib.utils.RegexUtils; @@ -65,7 +65,6 @@ import java.util.ArrayList; import java.util.List; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -90,8 +89,6 @@ import okhttp3.RequestBody; public class UserRecordAddActivity extends BaseActivity { - @BindView(R2.id.rg_type) - RadioGroup mRgType; @BindView(R2.id.et_name) EditText mEtName; @BindView(R2.id.tv_gender) @@ -156,10 +153,6 @@ public class UserRecordAddActivity extends BaseActivity { TextView mTvPersionType; @BindView(R2.id.ll_job) LinearLayout mLlJob; - @BindView(R2.id.rb_base) - RadioButton mRbBase; - @BindView(R2.id.rb_job) - RadioButton mRbJob; @BindView(R2.id.btn_add_educate) Button mBtnAddEducate; @BindView(R2.id.rlv_educate) @@ -176,6 +169,18 @@ public class UserRecordAddActivity extends BaseActivity { RecyclerView mRlvResumeFile; @BindView(R2.id.rlv_imgs) 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 mGenderList; @@ -253,14 +258,23 @@ public class UserRecordAddActivity extends BaseActivity { mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("保存"); mTvPublish.setOnClickListener(v -> doSaveRecord()); - mRgType.setOnCheckedChangeListener((v, i) -> { - if (i == R.id.rb_base) { - mLlBase.setVisibility(View.VISIBLE); - mLlJob.setVisibility(View.GONE); - } else if (i == R.id.rb_job) { - mLlBase.setVisibility(View.GONE); - mLlJob.setVisibility(View.VISIBLE); - } + //个人简历 + mLlTypeBase.setOnClickListener(v -> { + mLlBase.setVisibility(View.VISIBLE); + mLlJob.setVisibility(View.GONE); + 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); + 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()); mTvPolitical.setOnClickListener(v -> onShowPolitical()); @@ -344,7 +358,7 @@ public class UserRecordAddActivity extends BaseActivity { mImgList = new ArrayList<>(); mImgList.add(new AddFileBean()); mImgAdapter = new AddFileAdapter(mActivity, mImgList); - mRlvImgs.setLayoutManager(new GridLayoutManager(mActivity, 5)); + mRlvImgs.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvImgs.setAdapter(mImgAdapter); mImgAdapter.addOnItemClickListener(addFileBean -> { if (TextUtils.isEmpty(addFileBean.getId())) { @@ -394,7 +408,7 @@ public class UserRecordAddActivity extends BaseActivity { mFileAdapter.notifyDataSetChanged(); ++mFileMax; }); - mRlvResumeFile.setLayoutManager(new GridLayoutManager(mActivity, 5)); + mRlvResumeFile.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvResumeFile.setAdapter(mFileAdapter); } diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java index bc04bdc..a9f7c27 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java @@ -6,9 +6,8 @@ import android.content.Intent; import android.graphics.Color; import android.text.TextUtils; import android.view.View; +import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RadioButton; -import android.widget.RadioGroup; import android.widget.TextView; 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.BaseActivity; 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.FileUtils; import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.UIUtil; -import com.tenlionsoft.baselib.utils.UserLgUtils; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R2; 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) 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) TextView mTvName; @BindView(R2.id.tv_gender) @@ -142,6 +135,18 @@ public class UserRecordDetailActivity extends BaseActivity { TextView mTvResumeHint; @BindView(R2.id.rlv_imgs) 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 protected int setLayoutId() { @@ -152,14 +157,23 @@ public class UserRecordDetailActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mTvBaseTitle.setText("个人档案"); - mRgType.setOnCheckedChangeListener((v, id) -> { - if (id == R.id.rb_base) { - mLlBase.setVisibility(View.VISIBLE); - mLlJob.setVisibility(View.GONE); - } else if (id == R.id.rb_job) { - mLlBase.setVisibility(View.GONE); - mLlJob.setVisibility(View.VISIBLE); - } + //个人简历 + mLlTypeBase.setOnClickListener(v -> { + mLlBase.setVisibility(View.VISIBLE); + mLlJob.setVisibility(View.GONE); + 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); + 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(); } @@ -214,9 +228,7 @@ public class UserRecordDetailActivity extends BaseActivity { .build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_ADD) .navigation(mActivity, 12); }) - .setNegativeButton("取消", (dialog, which) -> { - dialog.dismiss(); - }) + .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) .create() .show(); } diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordEditActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordEditActivity.java index cc66ea5..a331e0c 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordEditActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordEditActivity.java @@ -8,9 +8,8 @@ import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RadioButton; -import android.widget.RadioGroup; import android.widget.TextView; 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.chat.GlideEngine; 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.FileUtils; import com.tenlionsoft.baselib.utils.RegexUtils; @@ -68,7 +68,6 @@ import java.util.ArrayList; import java.util.List; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -93,8 +92,6 @@ import okhttp3.RequestBody; public class UserRecordEditActivity extends BaseActivity { - @BindView(R2.id.rg_type) - RadioGroup mRgType; @BindView(R2.id.et_name) EditText mEtName; @BindView(R2.id.tv_gender) @@ -163,10 +160,6 @@ public class UserRecordEditActivity extends BaseActivity { RecyclerView mRlvResumeFile; @BindView(R2.id.ll_job) LinearLayout mLlJob; - @BindView(R2.id.rb_base) - RadioButton mRbBase; - @BindView(R2.id.rb_job) - RadioButton mRbJob; @BindView(R2.id.btn_del) Button mBtnDel; @BindView(R2.id.rlv_imgs) @@ -181,6 +174,18 @@ public class UserRecordEditActivity extends BaseActivity { Button mBtnAddResume; @BindView(R2.id.tv_resume_int) 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 mGenderList; @@ -471,14 +476,24 @@ public class UserRecordEditActivity extends BaseActivity { mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("保存"); mTvPublish.setOnClickListener(v -> doSaveRecord()); - mRgType.setOnCheckedChangeListener((v, i) -> { - if (i == R.id.rb_base) { - mLlBase.setVisibility(View.VISIBLE); - mLlJob.setVisibility(View.GONE); - } else if (i == R.id.rb_job) { - mLlBase.setVisibility(View.GONE); - mLlJob.setVisibility(View.VISIBLE); - } + + //个人简历 + mLlTypeBase.setOnClickListener(v -> { + mLlBase.setVisibility(View.VISIBLE); + mLlJob.setVisibility(View.GONE); + 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); + 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()); mTvPolitical.setOnClickListener(v -> onShowPolitical()); @@ -523,7 +538,7 @@ public class UserRecordEditActivity extends BaseActivity { if (mEducateDetailBeans.size() > 0) { mTvEducateInt.setVisibility(View.GONE); } else { - mTvEducateInt.setVisibility(View.GONE); + mTvEducateInt.setVisibility(View.VISIBLE); } } @@ -547,7 +562,7 @@ public class UserRecordEditActivity extends BaseActivity { if (mResumeBeans.size() > 0) { mTvResumeInt.setVisibility(View.GONE); } else { - mTvResumeInt.setVisibility(View.GONE); + mTvResumeInt.setVisibility(View.VISIBLE); } } @@ -562,7 +577,7 @@ public class UserRecordEditActivity extends BaseActivity { mImgList = new ArrayList<>(); mImgList.add(new AddFileBean()); mImgAdapter = new AddFileAdapter(mActivity, mImgList); - mRlvImgs.setLayoutManager(new GridLayoutManager(mActivity, 5)); + mRlvImgs.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvImgs.setAdapter(mImgAdapter); mImgAdapter.addOnItemClickListener(addFileBean -> { if (TextUtils.isEmpty(addFileBean.getId())) { @@ -609,7 +624,7 @@ public class UserRecordEditActivity extends BaseActivity { mFileAdapter.notifyDataSetChanged(); ++mFileMax; }); - mRlvResumeFile.setLayoutManager(new GridLayoutManager(mActivity, 5)); + mRlvResumeFile.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvResumeFile.setAdapter(mFileAdapter); mBtnDel.setOnClickListener(v -> onShowConfirm()); } @@ -1314,8 +1329,8 @@ public class UserRecordEditActivity extends BaseActivity { bean.setIdCard(idcard);//身份证号 bean.setPoliticalOutlook(mSelPolitical.getDataId());//政治面貌 bean.setMaritalStatus(mSelMarital.getDataId());//婚姻状况 - String nationality = mEtNationality.getText().toString().trim(); - bean.setNationality(nationality);//国籍 +// String nationality = mEtNationality.getText().toString().trim(); +// bean.setNationality(nationality);//国籍 String nativePlace = mEtNativePlace.getText().toString().trim(); bean.setNativeAddress(nativePlace);//籍贯 String passport = mEtPassport.getText().toString().trim(); diff --git a/oamodule/src/main/res/layout/activity_user_record_add.xml b/oamodule/src/main/res/layout/activity_user_record_add.xml index 06a5b1f..bc7ff6f 100644 --- a/oamodule/src/main/res/layout/activity_user_record_add.xml +++ b/oamodule/src/main/res/layout/activity_user_record_add.xml @@ -3,54 +3,80 @@ 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_f7" android:orientation="vertical" tools:context=".activity.record.UserRecordAddActivity"> - + android:layout_height="wrap_content"> - - + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="horizontal" + android:padding="5dp"> - - + + + + + + + + + + + + + + + + + tools:visibility="visible"> - + android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="vertical"> + + + + + + @@ -89,7 +133,7 @@ android:background="@null" android:gravity="right" android:hint="请输入姓名" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -109,11 +153,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择性别" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -133,11 +178,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择出生日期" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -160,7 +206,7 @@ android:digits="@string/limit_id_card" android:gravity="right" android:hint="请输入身份证号码" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -180,11 +226,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择政治面貌" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -204,15 +251,18 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择婚姻状况" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> - + @@ -252,7 +302,7 @@ android:background="@null" android:gravity="right" android:hint="请输入籍贯" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -274,7 +324,7 @@ android:background="@null" android:gravity="right" android:hint="请输入户口" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -294,11 +344,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择户口性质" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -320,7 +371,7 @@ android:background="@null" android:gravity="right" android:hint="请输入家庭地址" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -342,7 +393,7 @@ android:background="@null" android:gravity="right" android:hint="请输入电子邮箱" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -365,6 +416,7 @@ android:digits="@string/limit_phone" android:gravity="right" android:hint="请输入联系电话" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -386,7 +438,7 @@ android:background="@null" android:gravity="right" android:hint="请输入毕业院校" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -406,11 +458,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择专业" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -433,7 +486,7 @@ android:background="@null" android:gravity="right" android:hint="请输入最高学位" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -453,11 +506,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择毕业日期" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -479,7 +533,7 @@ android:background="@null" android:gravity="right" android:hint="请输入紧急联系人" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -502,7 +556,7 @@ android:digits="@string/limit_phone" android:gravity="right" android:hint="请输入紧急联系人联系电话" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -532,11 +586,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择入职日期" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -557,11 +612,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择转正日期" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -581,11 +637,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择所在部门" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -605,11 +662,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择岗位" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -629,11 +687,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择直接上级" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -655,7 +714,7 @@ android:background="@null" android:gravity="right" android:hint="请输入银行账号" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -677,7 +736,7 @@ android:background="@null" android:gravity="right" android:hint="请输入公积金号" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -699,7 +758,7 @@ android:background="@null" android:gravity="right" android:hint="请输入社保卡号" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -719,11 +778,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择职称" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -743,11 +803,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择职称职等" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -767,18 +828,21 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:clickable="true" - android:drawableRight="@drawable/ic_arrow_right" + android:drawableRight="@drawable/ic_arrow_right_24" + android:drawablePadding="5dp" android:focusable="true" android:gravity="right" android:hint="请选择人员分类" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp"> @@ -833,7 +898,9 @@ + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp"> diff --git a/oamodule/src/main/res/layout/activity_user_record_detail.xml b/oamodule/src/main/res/layout/activity_user_record_detail.xml index a4e225f..52a5744 100644 --- a/oamodule/src/main/res/layout/activity_user_record_detail.xml +++ b/oamodule/src/main/res/layout/activity_user_record_detail.xml @@ -3,54 +3,75 @@ 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_f7" android:orientation="vertical" tools:context=".activity.record.UserRecordAddActivity"> - + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="horizontal" + android:padding="5dp"> - - + android:orientation="vertical"> - + + + + + - + android:layout_marginLeft="15dp" + android:orientation="vertical"> + + + + + + + tools:visibility="visible"> @@ -112,7 +133,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -135,7 +156,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -158,7 +179,7 @@ android:digits="@string/limit_id_card" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -181,7 +202,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -204,11 +225,13 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> - + @@ -248,7 +271,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -270,7 +293,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -293,7 +316,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -315,7 +338,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -337,7 +360,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -360,7 +383,7 @@ android:digits="@string/limit_phone" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -382,7 +405,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -403,7 +426,7 @@ android:layout_gravity="center_vertical" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -426,7 +449,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -447,7 +470,7 @@ android:layout_gravity="center_vertical" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -469,7 +492,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -491,7 +514,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -524,7 +547,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -548,7 +571,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -571,7 +594,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -594,7 +617,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -617,7 +640,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -639,7 +662,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -661,7 +684,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -683,7 +706,7 @@ android:background="@null" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -706,7 +729,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -729,7 +752,7 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> @@ -752,14 +775,16 @@ android:focusable="true" android:gravity="right" android:hint="未录入" - android:textColor="@color/black" + android:textColor="@color/gray_80" android:textSize="14sp" /> + android:layout_height="wrap_content"> - + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="horizontal" + android:padding="5dp"> - - + android:orientation="vertical"> - + + + + + - + android:layout_marginLeft="15dp" + android:orientation="vertical"> + + + + + +