1.修复个人简历期望工作地点选择省市区时在已有区信息情况下未选择区信息后保存数据没有把区信息重置为0的bug

2.在个人简历界面和求职意向界面显示期望地点信息统一取接口返回地址

app/build.gradle

@@ -24,8 +24,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
         multiDexKeepProguard file("multidexKeep.pro")//腾讯bugly的类放到主Dex
-        versionCode 339
-        versionName "3.3.9"
+        versionCode 332
+        versionName "3.3.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
         ndk {

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/mine/PersonalResumeActivity.java

@@ -156,8 +156,8 @@ public class PersonalResumeActivity extends BaseActivity<PersonalResumePresenter
             } else {
                 tvExpectPosition.setText("");
             }
-            if (!TextUtils.isEmpty(resumeBean.getExpectationCityId())) {//求职地址
-                tvExpectAddress.setText(BaseInformationUtils.getPCAAddress(mContext, resumeBean.getExpectationProvinceId(), resumeBean.getExpectationCityId(), resumeBean.getExpectationCountryId()));
+            if (!TextUtils.isEmpty(resumeBean.getExpectationAddress())) {//求职地址
+                tvExpectAddress.setText(resumeBean.getExpectationAddress());
             } else {
                 tvExpectAddress.setText("");
             }

app/src/main/java/com/tongyu/luck/happywork/ui/mvp/cclient/model/JobIntentionModel.java

@@ -63,6 +63,8 @@ public class JobIntentionModel extends BaseModel implements JobIntentionContacts
             if ((cityBean == null || !cityBean.getCityName().equals(areaBean.getAreaName())) && !"0".equals(areaBean.getAreaCode())) {//如果市区重名或者区为选择"全部"则不附加名称
                 result += areaBean.getAreaName();
             }
+        }else{//未选择区则表示全部
+            areaCode = "0";
         }
         return result;
     }

app/src/main/java/com/tongyu/luck/happywork/ui/mvp/cclient/presenter/JobIntentionPresenter.java

@@ -1,5 +1,7 @@
 package com.tongyu.luck.happywork.ui.mvp.cclient.presenter;
 
+import android.text.TextUtils;
+
 import com.tongyu.luck.happywork.R;
 import com.tongyu.luck.happywork.bean.AreaBean;
 import com.tongyu.luck.happywork.bean.BaseInformationBean;
@@ -97,7 +99,7 @@ public class JobIntentionPresenter extends BasePresenter<JobIntentionActivity> i
             ResumeBean resumeBean = mJobIntentionModel.getJobIntention();
             if (resumeBean != null && resumeBean.isJobIntention()) {
                 mvpReference.get().onJobIntention(BaseInformationUtils.getExpectationPosition(mvpReference.get(), resumeBean.getExpectationPosition())
-                        , BaseInformationUtils.getPCAAddress(mvpReference.get(), resumeBean.getExpectationProvinceId(), resumeBean.getExpectationCityId(), resumeBean.getExpectationCountryId()), BaseInformationUtils.getSalary(mvpReference.get(), resumeBean.getExpectationSalary()));
+                        , TextUtils.isEmpty(resumeBean.getExpectationAddress()) ? "" : resumeBean.getExpectationAddress(), BaseInformationUtils.getSalary(mvpReference.get(), resumeBean.getExpectationSalary()));
             }
         }
     }