1.添加工作地址点击提示

2.单选数据选择后自动回收

app/build.gradle

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

app/src/main/java/com/tongyu/luck/happywork/ui/activity/bclient/resume/InvitedInterviewActivity.java

@@ -132,6 +132,7 @@ public class InvitedInterviewActivity extends BaseActivity<InvitedInterviewPrese
         @Override
         public void onSelect(String date) {
             tvDate.setText(date);
+            salDate.toggleExpand();
         }
     };
 

app/src/main/java/com/tongyu/luck/happywork/ui/fragment/bclient/PositionFullReleaseFragment.java

@@ -273,8 +273,10 @@ public class PositionFullReleaseFragment extends BaseFragment<PositionFullReleas
      */
     BaseSalaryHolder.OnSalarySelectListener onSalarySelectListener = new BaseSalaryHolder.OnSalarySelectListener() {
         @Override
-        public void onSelect(String salary) {
+        public void onSelect(String salary, boolean isUserSelect) {
             tvSalaryInterval.setText(salary);
+            if (isUserSelect)
+                salSalaryInterval.toggleExpand();
         }
     };
     /**
@@ -282,8 +284,10 @@ public class PositionFullReleaseFragment extends BaseFragment<PositionFullReleas
      */
     EducationalRequirementHolder.OnEducationalSelectListener onEducationalSelectListener = new EducationalRequirementHolder.OnEducationalSelectListener() {
         @Override
-        public void onSelect(String educational) {
+        public void onSelect(String educational, boolean isUserSelect) {
             tvEducationalRequirement.setText(educational);
+            if (isUserSelect)
+                salEducationalRequirement.toggleExpand();
         }
     };
 
@@ -301,8 +305,10 @@ public class PositionFullReleaseFragment extends BaseFragment<PositionFullReleas
      */
     LengthOfServiceHolder.OnLengthOfServiceListener onLengthOfServiceListener = new LengthOfServiceHolder.OnLengthOfServiceListener() {
         @Override
-        public void onSelect(String length) {
+        public void onSelect(String length, boolean isUserSelect) {
             tvLengthOfServiceInterval.setText(length);
+            if (isUserSelect)
+                salLengthOfServiceInterval.toggleExpand();
         }
     };
     /**
@@ -312,6 +318,7 @@ public class PositionFullReleaseFragment extends BaseFragment<PositionFullReleas
         @Override
         public void onSelect(String date) {
             tvDeadline.setText(date);
+            salDeadline.toggleExpand();
         }
     };
 

app/src/main/java/com/tongyu/luck/happywork/ui/fragment/bclient/PositionPartReleaseFragment.java

@@ -328,8 +328,10 @@ public class PositionPartReleaseFragment extends BaseFragment<PositionPartReleas
      */
     EducationalRequirementHolder.OnEducationalSelectListener onEducationalSelectListener = new EducationalRequirementHolder.OnEducationalSelectListener() {
         @Override
-        public void onSelect(String educational) {
+        public void onSelect(String educational, boolean isUserSelect) {
             tvEducationalRequirement.setText(educational);
+            if (isUserSelect)
+                salEducationalRequirement.toggleExpand();
         }
     };
     /**

app/src/main/java/com/tongyu/luck/happywork/ui/viewholder/bclient/BaseSalaryHolder.java

@@ -61,12 +61,12 @@ public class BaseSalaryHolder extends BaseViewHolder {
             public void onItemSelected(int index) {
                 mSelect = mData.get(index);
                 if (onSalarySelectListener != null)
-                    onSalarySelectListener.onSelect(mSelect.getName());
+                    onSalarySelectListener.onSelect(mSelect.getName(), true);
             }
         });
         mSelect = mData.get(mData.size() / 2);
         if (onSalarySelectListener != null)
-            onSalarySelectListener.onSelect(mSelect.getName());
+            onSalarySelectListener.onSelect(mSelect.getName(), false);
     }
 
     private void initData() {
@@ -89,7 +89,7 @@ public class BaseSalaryHolder extends BaseViewHolder {
                     mSelect = mData.get(i);
                     wvSalaryInterval.setCurrentItem(i);
                     if (onSalarySelectListener != null)
-                        onSalarySelectListener.onSelect(mSelect.getName());
+                        onSalarySelectListener.onSelect(mSelect.getName(), false);
                 }
             }
         }
@@ -112,7 +112,13 @@ public class BaseSalaryHolder extends BaseViewHolder {
     };
 
     public interface OnSalarySelectListener {
-        void onSelect(String educational);
+        /**
+         * 当选择后回调
+         *
+         * @param educational  数据
+         * @param isUserSelect 是否用户自我选择（如数据回显则是false）
+         */
+        void onSelect(String educational, boolean isUserSelect);
     }
 
     public BaseInformationBean getSelect() {

app/src/main/java/com/tongyu/luck/happywork/ui/viewholder/bclient/EducationalRequirementHolder.java

@@ -64,12 +64,12 @@ public class EducationalRequirementHolder extends BaseViewHolder {
             public void onItemSelected(int index) {
                 mSelect = mData.get(index);
                 if (onEducationalSelectListener != null)
-                    onEducationalSelectListener.onSelect(mSelect.getName());
+                    onEducationalSelectListener.onSelect(mSelect.getName(), true);
             }
         });
         mSelect = mData.get(3);
         if (onEducationalSelectListener != null)
-            onEducationalSelectListener.onSelect(mSelect.getName());
+            onEducationalSelectListener.onSelect(mSelect.getName(), false);
     }
 
     private void initData() {
@@ -90,7 +90,7 @@ public class EducationalRequirementHolder extends BaseViewHolder {
                     mSelect = mData.get(i);
                     wvEducation.setCurrentItem(i);
                     if (onEducationalSelectListener != null)
-                        onEducationalSelectListener.onSelect(mSelect.getName());
+                        onEducationalSelectListener.onSelect(mSelect.getName(), false);
                 }
             }
         }
@@ -113,7 +113,13 @@ public class EducationalRequirementHolder extends BaseViewHolder {
     };
 
     public interface OnEducationalSelectListener {
-        void onSelect(String educational);
+        /**
+         * 当选择后回调
+         *
+         * @param educational  数据
+         * @param isUserSelect 是否用户自我选择（如数据回显则是false）
+         */
+        void onSelect(String educational, boolean isUserSelect);
     }
 
     public BaseInformationBean getSelect() {

app/src/main/java/com/tongyu/luck/happywork/ui/viewholder/bclient/LengthOfServiceHolder.java

@@ -64,12 +64,12 @@ public class LengthOfServiceHolder extends BaseViewHolder {
             public void onItemSelected(int index) {
                 mSelect = mData.get(index);
                 if (onLengthOfServiceListener != null)
-                    onLengthOfServiceListener.onSelect(mSelect.getName());
+                    onLengthOfServiceListener.onSelect(mSelect.getName(), true);
             }
         });
         mSelect = mData.get(mData.size() / 2);
         if (onLengthOfServiceListener != null)
-            onLengthOfServiceListener.onSelect(mSelect.getName());
+            onLengthOfServiceListener.onSelect(mSelect.getName(), false);
     }
 
     private void initData() {
@@ -91,7 +91,7 @@ public class LengthOfServiceHolder extends BaseViewHolder {
                     mSelect = mData.get(i);
                     wvSalaryInterval.setCurrentItem(i);
                     if (onLengthOfServiceListener != null)
-                        onLengthOfServiceListener.onSelect(mSelect.getName());
+                        onLengthOfServiceListener.onSelect(mSelect.getName(), false);
                 }
             }
         }
@@ -114,7 +114,13 @@ public class LengthOfServiceHolder extends BaseViewHolder {
     };
 
     public interface OnLengthOfServiceListener {
-        void onSelect(String length);
+        /**
+         * 当选择后回调
+         *
+         * @param length       数据
+         * @param isUserSelect 是否用户自我选择（如数据回显则是false）
+         */
+        void onSelect(String length, boolean isUserSelect);
     }
 
     public BaseInformationBean getSelect() {

app/src/main/java/com/tongyu/luck/happywork/ui/viewholder/bclient/WorkAddressHolder.java

@@ -92,8 +92,14 @@ public class WorkAddressHolder extends BaseViewHolder {
                             mCitySelectPosition = cityPosition;
                             mCitySelect = cityItem;
                             mAreaData.addAll(cityItem.getAreaList());
-                            if (!mAreaData.isEmpty())
-                                mAreaSelect = mAreaData.get(0);
+                            for (int areaPosition = 0; areaPosition < mAreaData.size(); areaPosition++) {
+                                AreaBean areaItem = mAreaData.get(areaPosition);
+                                if ("新吴区".equals(areaItem.getAreaName())) {
+                                    mAreaSelectPosition = areaPosition;
+                                    mAreaSelect = areaItem;
+                                    break;
+                                }
+                            }
                             break;
                         }
                     }

app/src/main/res/values/strings.xml

@@ -333,7 +333,7 @@
     <string name="position_release">发布职位</string>
     <string name="position_is_end">已结束</string>
     <string name="position_is_over">已下架</string>
-    <string name="position_public_all">不填工作地点表示全国发布，填写有助于获取更加精确的求职信息</string>
+    <string name="position_public_all">不填工作地点表示全国发布，填写有助于获取更加精确的求职信息（点击具体地址可弹出和收起地址编辑框）</string>
 
     <string name="identity_company">企业认证</string>
     <string name="identity_result_going">审核中...</string>