Skip to content

android / dayu

Go to a project
Commit db9ccdc4 by 罗翻
Options

增加个人资料页面

parent 5a359247
Inline Side-by-side
Showing with 144 additions and 115 deletions
app/src/main/AndroidManifest.xml
......@@ -121,6 +121,7 @@
android:screenOrientation="portrait" />
<activity
android:name=".ui.LoginActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name=".ui.ReceivingActivity"
......
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -21,8 +21,8 @@ public class Constants {
/***********************测试环境配置**********************************/
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "http://47.94.101.239:3112";
public static final String BASE_URL = "http://192.168.1.136:3112";
public static final String BASE_URL = "http://47.94.101.239:3112";
// public static final String BASE_URL = "http://192.168.123.121:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static final boolean UM_DEBUG = true;
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
......@@ -323,8 +323,14 @@ public interface APIService {
@PUT(Constants.MESSAGE_HX)
Observable<BaseResponse<Boolean>> readMessage(@Body RequestBody body);
/**
* 修改个人资料.
*
* @param body
* @return
*/
@PUT(Constants.MODIFY_USER_INFO)
Observable<BaseResponse<Boolean>> modifyUserInfo(@Body RequestBody body);
Observable<BaseResponse<EngineerInfo>> modifyUserInfo(@Body RequestBody body);
/**
* 上传图片多张.
......
app/src/main/java/com/dayu/bigfish/api/ServerException.java
......@@ -62,12 +62,19 @@ public class ServerException extends Exception {
case "USER0021":
message = MyApplication.getContext().getString(R.string.sms_code_error);
break;
case "USER0003":
case "USER0023":
message = MyApplication.getContext().getString(R.string.engineer_acount_notavialibe);
break;
case "USER0024":
message = MyApplication.getContext().getString(R.string.engineer_not_have_site);
break;
case "USER0062":
message = MyApplication.getContext().getString(R.string.identity_is_error);
break;
case "USER0051":
message = MyApplication.getContext().getString(R.string.not_audite_aviliable);
break;
/** 账户相关*/
case "SETTLEMENT0015":
message = Constants.NOT_SHOW;
......
app/src/main/java/com/dayu/bigfish/bean/EngineerInfo.java
......@@ -15,8 +15,8 @@ public class EngineerInfo extends BaseObservable implements Serializable {
/**
* id : 30
* accountId : 115
* realName : 工程师
* identity : 110200198802021561
* mRealName : 工程师
* mIdentity : 110200198802021561
* mIdentityUrl : null
* accountUrl : null
* auditStatus : 2
......@@ -105,13 +105,14 @@ public class EngineerInfo extends BaseObservable implements Serializable {
this.accountUrl = accountUrl;
notifyPropertyChanged(BR.accountUrl);
}
@Bindable
public int getAduitStatus() {
return auditStatus;
}
public void setAduitStatus(int aduitStatus) {
this.auditStatus = aduitStatus;
notifyPropertyChanged(BR.aduitStatus);
}
public Object getCreateTime() {
......
app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java
......@@ -4,6 +4,7 @@ package com.dayu.bigfish.presenter.login;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.views.CustomDialog;
/**
......@@ -16,6 +17,7 @@ public interface LoginContract {
void changeVoiceCodeBtn();
void showLoginDialog(CustomDialog.OnCloseListener listener);
}
abstract class Presenter extends BasePresenter<View> {
......
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
......@@ -10,7 +10,6 @@ import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.AgreementActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.ui.PersonInfoActivity;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager;
......@@ -19,8 +18,6 @@ import com.hyphenate.chat.EMClient;
import io.reactivex.functions.Consumer;
import static com.dayu.bigfish.utils.UIUtils.getString;
/**
* Created by luofan on 2017/11/8.
*/
......@@ -113,17 +110,12 @@ public class LoginPresenter extends LoginContract.Presenter {
}
private void showLoginDialog() {
CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.engineer_identity_not_audite)
, (dialog, confirm) -> {
mView.showLoginDialog((dialog, confirm) -> {
if (confirm) {
startActivity(PersonInfoActivity.class);
}
dialog.dismiss();
});
customDialog.setTitle(getString(R.string.identity_not_audite))
.setPositiveButton(getString(R.string.submit_again))
.setOneButton(true);
customDialog.show();
}
@Override
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainContract.java
......@@ -3,7 +3,7 @@ package com.dayu.bigfish.presenter.main;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.ui.views.CustomDialog;
/**
* Created by luo on 2016/8/4.
......@@ -23,9 +23,13 @@ public interface MainContract {
* 跳转到待接单.
*/
void dumpReceActivity();
void showUpdateDialog(String upgradePrompt, CustomDialog.OnCloseListener listener);
void initNotification();
}
abstract class Presenter extends BasePresenter<MainActivity> {
abstract class Presenter extends BasePresenter<View> {
/**
* 获取新版本信息.
*
......
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonContract.java
......@@ -16,6 +16,7 @@ public interface ModifyPersonContract {
void showTip();
void showSubmiteDialog(CustomDialog.OnCloseListener listener);
}
abstract class Presenter extends BasePresenter<View> {
......
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java
package com.dayu.bigfish.presenter.modifyperson;
import android.databinding.ObservableBoolean;
import android.databinding.ObservableField;
import android.os.Bundle;
import android.text.TextUtils;
......@@ -26,9 +27,10 @@ import okhttp3.RequestBody;
*/
@InstanceFactory
public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
public ObservableField<String> realName = new ObservableField<>();
public ObservableField<String> identity = new ObservableField<>();
public ObservableField<String> mRealName = new ObservableField<>();
public ObservableField<String> mIdentity = new ObservableField<>();
public ObservableField<String> mIdentityUrl = new ObservableField<>("");
public ObservableBoolean isModifyPic = new ObservableBoolean(false);
private String mIvPath;
private EngineerInfo mInfo;
......@@ -38,8 +40,8 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
mInfo = (EngineerInfo) bundle.getSerializable(Constants.ENGINEERINFO);
if (mInfo != null) {
mIvPath = mInfo.getIdentityUrl();
realName.set(mInfo.getRealName());
identity.set(mInfo.getIdentity());
mRealName.set(mInfo.getRealName());
mIdentity.set(mInfo.getIdentity());
mIdentityUrl.set(mIvPath);
}
}
......@@ -51,11 +53,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
@Override
public void showSubmiteDialog() {
if (TextUtils.isEmpty(realName.get())) {
if (TextUtils.isEmpty(mRealName.get())) {
mView.showToast(R.string.name_not_empty);
return;
}
if (TextUtils.isEmpty(identity.get())) {
if (TextUtils.isEmpty(mIdentity.get())) {
mView.showToast(R.string.identity_not_empty);
return;
}
......@@ -65,7 +67,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
}
mView.showSubmiteDialog((dialog, confirm) -> {
if (confirm) {
if (isModifyPic.get()) {
uploadPic(mIdentityUrl.get());
} else {
modifyUserInfo(mRealName.get(), mIdentity.get(), mIdentityUrl.get());
}
}
dialog.dismiss();
});
......@@ -86,7 +92,7 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
@Override
public void accept(List<String> list) throws Exception {
if (list != null && list.size() > 0) {
modifyUserInfo(realName.get(), identity.get(), list.get(0));
modifyUserInfo(mRealName.get(), mIdentity.get(), list.get(0));
} else {
mView.showToast("修改头像失败");
}
......@@ -100,12 +106,15 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
params.put("accountId", mInfo.getAccountId());
params.put("realName", realName);
params.put("identity", identity);
params.put("mIdentityUrl", identityUrl);
params.put("dentityUrl", identityUrl);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.modifyUserInfo(body).subscribe(baseObserver(new Consumer<Boolean>() {
ApiFactory.modifyUserInfo(body).subscribe(baseObserver(new Consumer<EngineerInfo>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
public void accept(EngineerInfo engineerInfo) throws Exception {
mRealName.set(engineerInfo.getRealName());
mIdentity.set(engineerInfo.getIdentity());
mIdentityUrl.set(engineerInfo.getIdentityUrl());
mView.showTip();
}
}));
......
app/src/main/java/com/dayu/bigfish/presenter/myhead/MyHeadPresenter.java
......@@ -56,6 +56,8 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
@Override
public void accept(Boolean aBoolean) throws Exception {
headUrl.set(path);
mUserInfo.setHeaderImg(path);
UserManager.getInstance().saveUser(mActivity, mUserInfo);
PictureFileUtils.deleteCacheDirFile(mActivity);
}
}));
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailContract.java
......@@ -3,7 +3,7 @@ package com.dayu.bigfish.presenter.orderdetail;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.bean.OrderDetail;
/**
* Created by luo on 2016/8/4.
......@@ -12,9 +12,10 @@ public interface OrderDetailContract {
interface View extends BaseView {
void init(OrderDetail detail);
}
abstract class Presenter extends BasePresenter<OrderDetailsActivity> {
abstract class Presenter extends BasePresenter<View> {
public abstract void getOrderDetailInfo(int orderId);
}
......
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java
......@@ -37,10 +37,12 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@Override
public void dumpToModifyPerson() {
if (info.get().getAduitStatus() == 3) {
Bundle bundle = new Bundle();
bundle.putSerializable(Constants.ENGINEERINFO, info.get());
startActivity(ModifyPersonInfoActivity.class, bundle);
}
}
@Override
public void queryInfo(int accountId) {
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java
......@@ -5,6 +5,7 @@ import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.ui.ProcessOrderActivity;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -13,7 +14,16 @@ import java.util.List;
public interface ProcessOrderContract {
interface View extends BaseView {
/**
* 初始化+图片
*/
void initAddIv();
/**
* 初始化图片.
* @param list
*/
void initPhotoView(ArrayList<String> list);
}
abstract class Presenter extends BasePresenter<ProcessOrderActivity> {
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
......@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.processorder;
import android.content.Intent;
import android.databinding.ObservableBoolean;
import android.databinding.ObservableField;
import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory;
......@@ -48,6 +49,8 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
private OrderInfoDao mOrderInfoDao;
private ArrayList<String> mImages = new ArrayList<>();
public ObservableBoolean buttonState = new ObservableBoolean(false);
public ObservableField<OrderInfo> mOrderField = new ObservableField<>();
public ObservableField<OrderDetail> mDetail = new ObservableField<>();
private OrderInfo mOrderInfo;
private int isPay;//是否支付费用,默认=1 不支付费用
private int mAnyContacts;
......@@ -77,6 +80,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mOrderInfo.setEngineerId(mAccountId);
}
mView.mBind.setInfo(mOrderInfo);
// mOrderField.set(mOrderInfo);
if (mOrderInfo != null && TextUtils.isEmpty(mOrderInfo.getDoorPrice()) && TextUtils.isEmpty(mOrderInfo.getServerPrice())
&& TextUtils.isEmpty(mOrderInfo.getMaterialCost()) && TextUtils.isEmpty(mOrderInfo.getOtherPrice())) {
buttonState.set(false);
......@@ -90,6 +94,12 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
public void swtichButton() {
buttonState.set(!buttonState.get());
if (!buttonState.get()) {
// mOrderField.get().setDoorPrice("");
// mOrderField.get().setServerPrice("");
// mOrderField.get().setMaterialCost("");
// mOrderField.get().setOtherPrice("");
// mOrderField.get().setOtherInfo("");
mView.mBind.getInfo().setDoorPrice("");
mView.mBind.getInfo().setServerPrice("");
mView.mBind.getInfo().setMaterialCost("");
......@@ -104,6 +114,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
@Override
public void accept(OrderDetail detail) throws Exception {
mView.mBind.setItem(detail);
// mDetail.set(detail);
mAnyContacts = detail.getAnyContacts();
}
}));
......@@ -179,6 +190,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
ApiFactory.uploadPhoto(part).subscribe(baseObserver(new Consumer<List<String>>() {
@Override
public void accept(List<String> list) throws Exception {
// OrderInfo info = mOrderField.get();
OrderInfo info = mView.mBind.getInfo();
commitOrder(list, mOrderId, info.getServerRecord(),
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
......@@ -192,9 +204,11 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
@Override
public void saveOrder() {
if (mImages != null && mImages.size() > 0) {
// mOrderField.get().setImgPath(mImages);
mView.mBind.getInfo().setImgPath(mImages);
}
mOrderInfoDao.insertOrReplace(mView.mBind.getInfo());
// mOrderInfoDao.insertOrReplace(mOrderField.get());
mView.showToast(R.string.order_save_success);
mActivity.finish();
}
......@@ -212,6 +226,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
commitPhoto(mImages);
} else {
OrderInfo info = mView.mBind.getInfo();
// OrderInfo info = mOrderField.get();
commitOrder(null, mOrderId, info.getServerRecord(),
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
......
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
......@@ -5,6 +5,7 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.presenter.login.LoginContract;
import com.dayu.bigfish.presenter.login.LoginPresenter;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.TimeCountUtil;
......@@ -35,6 +36,16 @@ public class LoginActivity extends BaseActivity<LoginPresenter, LoginBinding> im
mBind.tvVoiceCode.setTextColor(getResources().getColor(R.color.cl_text));
mBind.tvVoiceCode.setClickable(false);
}
@Override
public void showLoginDialog(CustomDialog.OnCloseListener listener) {
CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.engineer_identity_not_audite)
, listener);
customDialog.setTitle(getString(R.string.identity_not_audite))
.setPositiveButton(getString(R.string.submit_again))
.setOneButton(true);
customDialog.show();
}
}
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -145,6 +145,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
*
* @param upgradePrompt 提示语
*/
@Override
public void showUpdateDialog(String upgradePrompt, CustomDialog.OnCloseListener listener) {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, upgradePrompt, listener);
dialog.setTitle(getString(R.string.have_new_version))
......@@ -156,6 +157,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
/**
* notifycation.
*/
@Override
public void initNotification() {
notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
builder = new NotificationCompat.Builder(this)
......@@ -198,7 +200,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
overridePendingTransition(R.anim.slide_bottom_in, 0);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
......@@ -224,7 +225,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Subscribe(threadMode = ThreadMode.MAIN)
public void recevieNum(RefreshReceivingNum event) {
mPresenter.tabRecive.set(event.getTabNum()+"");
mPresenter.tabRecive.set(event.getTabNum() + "");
}
@Subscribe(threadMode = ThreadMode.MAIN)
......
app/src/main/java/com/dayu/bigfish/ui/ModifyPersonInfoActivity.java
......@@ -7,8 +7,8 @@ import android.text.TextUtils;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.databinding.ActivityModifyPersonActivityBinding;
import com.dayu.bigfish.presenter.modifyperson.ModifyPersonPresenter;
import com.dayu.bigfish.presenter.modifyperson.ModifyPersonContract;
import com.dayu.bigfish.presenter.modifyperson.ModifyPersonPresenter;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.ToastUtils;
import com.luck.picture.lib.PictureSelectionModel;
......@@ -70,7 +70,8 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter
CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.audite_tip)
, (dialog, confirm) -> {
if (confirm) {
finish();
Intent intent = new Intent(mActivity, LoginActivity.class);
startActivity(intent);
}
dialog.dismiss();
});
......@@ -109,6 +110,7 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter
if (list != null) {
for (int a = 0; a < list.size(); a++) {
mPresenter.mIdentityUrl.set(list.get(a).getCutPath());
mPresenter.isModifyPic.set(true);
}
}
break;
......
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
......@@ -39,6 +39,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
mBind.titleBack.setOnClickListener(o -> finish());
}
@Override
public void init(OrderDetail detail) {
List<Fragment> fragments = new ArrayList<>();
List<String> titles = new ArrayList<>();
......
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
......@@ -52,6 +52,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
mAddIV.setOnClickListener(v -> showPicDialog());
}
@Override
public void initAddIv() {
mIvWeight = (UtilsScreen.getScreenWidth(mActivity) - UtilsScreen.dip2px(mActivity, 20)) / 5;
mAddIV = new ImageView(mActivity);
......@@ -96,6 +97,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
/**
* 图片列表显示.
*/
@Override
public void initPhotoView(ArrayList<String> list) {
mImages = list;
mBind.llImage.removeAllViews();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
......@@ -85,7 +85,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
if (info.getAduitStatus() == 1) {
mBind.ivAudited.setBackgroundResource(R.mipmap.icon_authentication);
} else {
mBind.ivAudited.setBackgroundResource(R.mipmap.icon_authentication);
mBind.ivAudited.setBackgroundResource(R.mipmap.icon_unauthentication);
}
mBind.tvAge.setText(info.getAge() + mActivity.getString(R.string.age));
mUserPhone = info.getMobile();
......
app/src/main/java/com/dayu/bigfish/utils/UtilsUserAccountMatcher.java
......@@ -37,10 +37,14 @@ public class UtilsUserAccountMatcher {
static Pattern isCntainChinesePn = Pattern.compile(szChinesePattern);
static String rfPasswordPattern = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$";
static String identityPattern = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$|^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9]|X)$";
static Pattern isIdentity = Pattern.compile(identityPattern);
static Pattern isPasswordPn = Pattern.compile(rfPasswordPattern);
private static String sNumberFormat = "^[1-9][0-9]*[.]?\\d{0,2}$|^0|^0\\.\\d{0,2}$";
public static boolean iSEmail(String email) {
return emailPattern.matcher(email).matches();
}
......@@ -77,6 +81,14 @@ public class UtilsUserAccountMatcher {
return false;
}
public static boolean isIdentityPattern(String str) {
Matcher m = isIdentity.matcher(str);
if (m.find()) {
return true;
}
return false;
}
/**
* Determine whether the mobile body height. The unit is cm
*
......
app/src/main/res/layout/activity_modify_person_activity.xml
......@@ -73,7 +73,7 @@
android:layout_marginLeft="35dp"
android:background="@null"
android:hint="请输入真实姓名"
android:text="@={presenter.realName}"
android:text="@={presenter.mRealName}"
android:textSize="15sp" />
</LinearLayout>
......@@ -105,7 +105,7 @@
android:layout_marginLeft="35dp"
android:background="@null"
android:hint="请输入证件号"
android:text="@={presenter.identity}"
android:text="@={presenter.mIdentity}"
android:textSize="15sp" />
</LinearLayout>
......
app/src/main/res/layout/activity_person_info.xml
......@@ -123,15 +123,15 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/real_name"
android:text="@string/person_identity_audite"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_name"
android:id="@+id/tv_audite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="@{presenter.info.realName}"
android:text='@{presenter.info.aduitStatus == 3?@string/identity_unaudite:@string/identity_audited}'
android:textSize="15sp" />
<ImageView
......@@ -141,78 +141,5 @@
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:onClick="@{()->presenter.dumpToModifyPerson()}"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/person_identity"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_identity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="@{presenter.info.identity}"
android:textSize="15sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight="@dimen/dp_15"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:background="@color/white"
android:gravity="center_vertical"
android:onClick="@{()->presenter.dumpToModifyPerson()}"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/person_identity_pic"
android:textSize="15sp" />
<ImageView
android:id="@+id/cv_identity"
imageUrl="@{presenter.info.identityUrl}"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/icon_identity" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight="@dimen/dp_15"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_personal_center.xml
......@@ -62,8 +62,23 @@
android:layout_marginTop="83.3dp"
android:onClick="@{()->presenter.dumpToPersonalInfo()}"
android:src="@mipmap/user"
app:border_color="@color/cl_home_circleimageview_bg"
app:border_width="@dimen/size_home_circleimageview_border" />
/>
<ImageView
android:layout_width="73dp"
android:layout_height="20dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="149.3dp"
android:src="@mipmap/head_shape" />
<TextView
android:layout_width="44dp"
android:layout_height="15dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="149.3dp"
android:text="个人资料"
android:textColor="@color/white"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_name"
......
app/src/main/res/mipmap-xxxhdpi/icon_authentication.png
app/src/main/res/mipmap-xxxhdpi/icon_authentication.png

4.05 KB | W: | H:

app/src/main/res/mipmap-xxxhdpi/icon_authentication.png

5.5 KB | W: | H:

app/src/main/res/mipmap-xxxhdpi/icon_authentication.png
app/src/main/res/mipmap-xxxhdpi/icon_authentication.png
app/src/main/res/mipmap-xxxhdpi/icon_authentication.png
app/src/main/res/mipmap-xxxhdpi/icon_authentication.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png
app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png

26.5 KB | W: | H:

app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png

37 KB | W: | H:

app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png
app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png
app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png
app/src/main/res/mipmap-xxxhdpi/icon_identity_default.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/values/strings.xml
......@@ -268,6 +268,9 @@
<string name="person_mobile">手机号码</string>
<string name="real_name">真实姓名</string>
<string name="person_identity">身份证号</string>
<string name="person_identity_audite">身份认证</string>
<string name="identity_unaudite">未通过</string>
<string name="identity_audited">已认证</string>
<string name="person_identity_pic">身份证照片</string>
<string name="commite_identity_pic">上传身份证照片</string>
<string name="commite_pic_zero">已上传0/1张</string>
......@@ -277,6 +280,7 @@
<string name="reminder_content">"·请上传真实清晰完整的手持身份证照片·若认证失败，可修改认证信息后再次提交"</string>
<string name="name_not_empty">真实姓名不能为空</string>
<string name="identity_not_empty">身份证号不能为空</string>
<string name="identity_error">请输入正确的身份证号码</string>
<string name="identityurl_not_empty">身份证照片不能为空</string>
......@@ -312,6 +316,8 @@
<string name="order_cancle_not_process">工单已取消,不能处理了</string>
<string name="order_receive_already">已被接单，请选择其他工单</string>
<string name="perameter_is_null">参数为空</string>
<string name="identity_is_error">身份证号不合法</string>
<string name="not_audite_aviliable">该工程师不处于审核拒绝状态</string>
<string name="agreement">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment