yutou/test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix [英文版-用户-选择多个爱好后，内容与标签名隔开下；保存成功提示语还是中文；保存成功后，选择的内容项也是中文显示，参考右图]

Browse Source
This commit is contained in:
zlzw 2024-03-28 14:13:06 +08:00
parent dcf7cfa889
commit d8e002a8bd
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java
View File

@ -113,6 +113,8 @@ public class MessageUserInfoBean extends BaseModel{
private int is_hello; private int is_hello;
private String star_name; private String star_name;
private String career; private String career;
@SerializedName("en_career")
private String enCareer;
private String height; private String height;
private String age; private String age;
@SerializedName("open_off") @SerializedName("open_off")
@ -120,6 +122,14 @@ public class MessageUserInfoBean extends BaseModel{
@SerializedName("rong_online") @SerializedName("rong_online")
private int rongOnline;//0 在线 非0 其他 private int rongOnline;//0 在线 非0 其他
public String getEnCareer() {
return enCareer;
}
public void setEnCareer(String enCareer) {
this.enCareer = enCareer;
}
public void setOpenOff(int openOff) { public void setOpenOff(int openOff) {
this.openOff = openOff; this.openOff = openOff;
} }

4
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@ -450,7 +450,7 @@ public class EditProfileActivity extends AbsActivity {
.setCareer(cn, en, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() { .setCareer(cn, en, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
@Override @Override
public void onSuccess(HttpCallbackModel data) { public void onSuccess(HttpCallbackModel data) {
ToastUtil.show(data.getMsg()); // ToastUtil.show(data.getMsg());
((TextView) findViewById(R.id.occupation)).setText(WordUtil.isNewZh() ? cn : en); ((TextView) findViewById(R.id.occupation)).setText(WordUtil.isNewZh() ? cn : en);
} }
@ -878,7 +878,7 @@ public class EditProfileActivity extends AbsActivity {
@Override @Override
public void onSuccess(MessageUserInfoBean data) { public void onSuccess(MessageUserInfoBean data) {
userInfoBean = 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(); String height = data.getInfo().getHeight();
if ("0".equals(height) || StringUtil.isEmpty(height)) { if ("0".equals(height) || StringUtil.isEmpty(height)) {
// height="170"; // height="170";

6
main/src/main/res/layout/activity_edit_profile.xml
View File

@ -494,10 +494,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="70dp" android:layout_marginStart="90dp"
android:layout_marginRight="25dp" android:layout_marginEnd="25dp"
android:ellipsize="end" android:ellipsize="end"
android:gravity="right" android:gravity="end"
android:singleLine="true" android:singleLine="true"
android:textColor="#353535" android:textColor="#353535"
android:textSize="14sp" android:textSize="14sp"