1.自发布地址增加删除功能

app/build.gradle

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

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/job/InterviewInvitationDetailActivity.java

@@ -20,8 +20,6 @@ import butterknife.BindView;
 public class InterviewInvitationDetailActivity extends BaseActivity<InterviewInvitationDetailPresenter> implements InterviewInvitationDetailContacts.IInterviewInvitationDetailView {
     @BindView(R.id.tv_position)
     TextView tvPosition;
-    @BindView(R.id.tv_address)
-    TextView tvAddress;
     @BindView(R.id.tv_company)
     TextView tvCompany;
     @BindView(R.id.tv_time)
@@ -71,8 +69,6 @@ public class InterviewInvitationDetailActivity extends BaseActivity<InterviewInv
         setLoadingVisible(false);
         tvPosition.setText(TextUtils.isEmpty(bean.getPositionName()) ? "" : bean.getPositionName());
         tvCompany.setText(TextUtils.isEmpty(bean.getCompanyName()) ? "" : bean.getCompanyName());
-//        tvAddress.setText(TextUtils.isEmpty(bean.getInterviewAddres()) ? "" : bean.getInterviewAddres());
-        tvAddress.setVisibility(View.GONE);
         tvTime.setText(DateUtils.getFormatStrToStr(bean.getInviteTime(), "yyyy-MM-dd HH:mm"));
         tvName.setText(TextUtils.isEmpty(bean.getRealName()) ? "" : bean.getRealName() + "：");
 

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

@@ -450,6 +450,7 @@ public class PositionFullReleaseFragment extends BaseFragment<PositionFullReleas
      */
     private void addWorkAddress(PositionAddressBean bean, boolean isPublishNationwide) {
         WorkAddressHolderView mHolder = new WorkAddressHolderView(mContext, svTwo);
+        mHolder.setOnDelAddressListener(onDelAddressListener);
         if (bean != null)
             mHolder.initShowBack(bean);
         else if (isPublishNationwide)
@@ -460,4 +461,15 @@ public class PositionFullReleaseFragment extends BaseFragment<PositionFullReleas
         mHolderViews.add(mHolder);
         tvWorkAddress.setHint(R.string.hint_click_add_select_address);
     }
+
+    /**
+     * 删除回调
+     */
+    WorkAddressHolderView.OnDelAddressListener onDelAddressListener = new WorkAddressHolderView.OnDelAddressListener() {
+        @Override
+        public void onDel(WorkAddressHolderView viewHolder) {
+            llWorkAddress.removeView(viewHolder.getView());
+            mHolderViews.remove(viewHolder);
+        }
+    };
 }

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

@@ -542,6 +542,7 @@ public class PositionPartReleaseFragment extends BaseFragment<PositionPartReleas
      */
     private void addWorkAddress(PositionAddressBean bean, boolean isPublishNationwide) {
         WorkAddressHolderView mHolder = new WorkAddressHolderView(mContext, sv);
+        mHolder.setOnDelAddressListener(onDelAddressListener);
         if (bean != null)
             mHolder.initShowBack(bean);
         else if (isPublishNationwide)
@@ -552,4 +553,16 @@ public class PositionPartReleaseFragment extends BaseFragment<PositionPartReleas
         mHolderViews.add(mHolder);
         tvWorkAddress.setHint(R.string.hint_click_add_select_address);
     }
+
+
+    /**
+     * 删除回调
+     */
+    WorkAddressHolderView.OnDelAddressListener onDelAddressListener = new WorkAddressHolderView.OnDelAddressListener() {
+        @Override
+        public void onDel(WorkAddressHolderView viewHolder) {
+            llWorkAddress.removeView(viewHolder.getView());
+            mHolderViews.remove(viewHolder);
+        }
+    };
 }

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

@@ -323,7 +323,6 @@ public class WorkAddressHolder extends BaseViewHolder {
 
     public interface OnAddressChangeListener {
         void onChange(String address);
-
     }
 
 

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

@@ -20,7 +20,11 @@ public class WorkAddressHolderView extends BaseViewHolder {
     TextView tvWorkAddress;
     @BindView(R.id.sal_work_address)
     ShrinkAnimationLayout salWorkAddress;
+    @BindView(R.id.v_del)
+    View vDel;
     WorkAddressHolder workAddressHolder;
+    OnDelAddressListener onDelAddressListener;
+
 
     public WorkAddressHolderView(Context mContext, ScrollView scrollView) {
         super(mContext);
@@ -34,9 +38,14 @@ public class WorkAddressHolderView extends BaseViewHolder {
         return R.layout.view_work_address_select;
     }
 
-    @OnClick(R.id.tv_work_address)
+    @OnClick({R.id.tv_work_address, R.id.v_del})
     public void onClick(View view) {
-        salWorkAddress.toggleExpand();
+        if (view.getId() == R.id.tv_work_address) {
+            salWorkAddress.toggleExpand();
+        } else {
+            if (onDelAddressListener != null)
+                onDelAddressListener.onDel(this);
+        }
     }
 
     /**
@@ -68,6 +77,8 @@ public class WorkAddressHolderView extends BaseViewHolder {
         public void onChange(String address) {
             tvWorkAddress.setText(address);
         }
+
+
     };
 
     /**
@@ -87,4 +98,13 @@ public class WorkAddressHolderView extends BaseViewHolder {
     public WorkAddressBean getWorkAddressBean() {
         return workAddressHolder.getWorkAddressBean();
     }
+
+
+    public void setOnDelAddressListener(OnDelAddressListener onDelAddressListener) {
+        this.onDelAddressListener = onDelAddressListener;
+    }
+
+    public interface OnDelAddressListener {
+        void onDel(WorkAddressHolderView view);
+    }
 }

app/src/main/java/com/tongyu/luck/happywork/ui/viewholder/cclient/PositionListViewHolder.java

@@ -147,7 +147,7 @@ public class PositionListViewHolder extends BaseViewHolder {
                 if (addressBean != null && !TextUtils.isEmpty(addressBean.getAdName()))
                     positionAddress = addressBean.getAdName();
             }
-            if (TextUtils.isEmpty(positionAddress) && (bean.getIsPublishNationwide() || bean.isPublishNationwide()))
+            if (TextUtils.isEmpty(positionAddress) && (bean.getIsPublishNationwide()|| bean.isPublishNationwide()))
                 positionAddress = "全国";
             tvArea.setText(positionAddress);
             //福利标签显示
@@ -292,7 +292,7 @@ public class PositionListViewHolder extends BaseViewHolder {
                         areaStr += positionAddressBean.getAddress();
                     }
                 }
-                if (TextUtils.isEmpty(areaStr) && (bean.getIsPublishNationwide() || bean.isPublishNationwide()))
+                if (TextUtils.isEmpty(areaStr) && (bean.getIsPublishNationwide() ||bean.isPublishNationwide()))
                     areaStr = "全国";
                 tvPartAddress.setText(areaStr);
             }

app/src/main/res/layout/activity_job_interview_detail.xml

@@ -7,36 +7,22 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="74dp"
+        android:layout_height="wrap_content"
+        android:minHeight="74dp"
         android:background="@color/white"
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/tv_position"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:gravity="bottom"
-            android:orientation="horizontal">
+            android:text="夏普电子 操作工"
+            android:textColor="@color/text_dark_black"
+            android:textSize="@dimen/px54_18sp" />
 
-            <TextView
-                android:id="@+id/tv_position"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="夏普电子 操作工"
-                android:textColor="@color/text_dark_black"
-                android:textSize="@dimen/px54_18sp" />
-
-            <TextView
-                android:id="@+id/tv_address"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="江苏-无锡-新区"
-                android:textColor="@color/text_dark_gray"
-                android:textSize="@dimen/px30_10sp" />
-        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"

app/src/main/res/layout/view_work_address_select.xml

@@ -34,6 +34,13 @@
             android:textColor="@color/blue_main"
             android:textColorHint="@color/text_dark_gray2"
             android:textSize="@dimen/px36_12sp" />
+
+        <View
+            android:id="@+id/v_del"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_marginLeft="11dp"
+            android:background="@mipmap/ic_position_address_del" />
     </LinearLayout>
 
     <com.tongyu.luck.happywork.baselibrary.widget.ShrinkAnimationLayout