diff --git a/common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java b/common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java index 1aaa44d..4de3e7d 100644 --- a/common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java +++ b/common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java @@ -113,6 +113,8 @@ public class MessageUserInfoBean extends BaseModel{ private int is_hello; private String star_name; private String career; + @SerializedName("en_career") + private String enCareer; private String height; private String age; @SerializedName("open_off") @@ -120,6 +122,14 @@ public class MessageUserInfoBean extends BaseModel{ @SerializedName("rong_online") private int rongOnline;//0 在线 非0 其他 + public String getEnCareer() { + return enCareer; + } + + public void setEnCareer(String enCareer) { + this.enCareer = enCareer; + } + public void setOpenOff(int openOff) { this.openOff = openOff; } diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java index 9773cb4..3971257 100644 --- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java @@ -450,7 +450,7 @@ public class EditProfileActivity extends AbsActivity { .setCareer(cn, en, new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(HttpCallbackModel data) { - ToastUtil.show(data.getMsg()); +// ToastUtil.show(data.getMsg()); ((TextView) findViewById(R.id.occupation)).setText(WordUtil.isNewZh() ? cn : en); } @@ -878,7 +878,7 @@ public class EditProfileActivity extends AbsActivity { @Override public void onSuccess(MessageUserInfoBean data) { userInfoBean = data; - ((TextView) findViewById(R.id.occupation)).setText(data.getInfo().getCareer()); + ((TextView) findViewById(R.id.occupation)).setText(WordUtil.isNewZh()?data.getInfo().getCareer():data.getInfo().getEnCareer()); String height = data.getInfo().getHeight(); if ("0".equals(height) || StringUtil.isEmpty(height)) { // height="170"; diff --git a/main/src/main/res/layout/activity_edit_profile.xml b/main/src/main/res/layout/activity_edit_profile.xml index f7672ec..ca8da3d 100644 --- a/main/src/main/res/layout/activity_edit_profile.xml +++ b/main/src/main/res/layout/activity_edit_profile.xml @@ -494,10 +494,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="70dp" - android:layout_marginRight="25dp" + android:layout_marginStart="90dp" + android:layout_marginEnd="25dp" android:ellipsize="end" - android:gravity="right" + android:gravity="end" android:singleLine="true" android:textColor="#353535" android:textSize="14sp"