1.我的报名列表新增取消订单

2.需求详情新增下架  取消订单显示

app/src/main/java/com/webrain/happywork/bean/EnrollmentBean.java

@@ -13,6 +13,7 @@ public class EnrollmentBean {
     private RequirementBean hwRequirement;
     private String companyName;
     private String orderNumber;
+    private boolean displayCancel;
     private CompanyBean hwPlatformCompany;
 
     public String getId() {
@@ -118,4 +119,12 @@ public class EnrollmentBean {
     public void setHwPlatformCompany(CompanyBean hwPlatformCompany) {
         this.hwPlatformCompany = hwPlatformCompany;
     }
+
+    public boolean isDisplayCancel() {
+        return displayCancel;
+    }
+
+    public void setDisplayCancel(boolean displayCancel) {
+        this.displayCancel = displayCancel;
+    }
 }

app/src/main/java/com/webrain/happywork/bean/api/ApiRequirementDetailBean.java

@@ -7,6 +7,8 @@ public class ApiRequirementDetailBean {
 
     boolean needEnrollment;
 
+    boolean displayCancel;
+
     public RequirementBean getHwRequirementAPI() {
         return hwRequirementAPI;
     }
@@ -22,4 +24,13 @@ public class ApiRequirementDetailBean {
     public void setNeedEnrollment(boolean needEnrollment) {
         this.needEnrollment = needEnrollment;
     }
+
+
+    public boolean isDisplayCancel() {
+        return displayCancel;
+    }
+
+    public void setDisplayCancel(boolean displayCancel) {
+        this.displayCancel = displayCancel;
+    }
 }

app/src/main/java/com/webrain/happywork/ui/activity/DemandDetailActivity.java

@@ -10,7 +10,6 @@ import android.widget.TextView;
 import com.webrain.baselibrary.AppConstant;
 import com.webrain.baselibrary.EventConstant;
 import com.webrain.baselibrary.event.StringEvent;
-import com.webrain.baselibrary.utils.DateUtils;
 import com.webrain.happywork.AppCacheManager;
 import com.webrain.happywork.R;
 import com.webrain.happywork.bean.RequirementBean;
@@ -48,10 +47,13 @@ public class DemandDetailActivity extends BaseActivity<DemandDetailPresenter> im
     Button btnApply;
     @BindView(R.id.tv_stage)
     TextView tvStage;
+    @BindView(R.id.tv_down)
+    TextView tvDown;
 
     MineLightDialog mineLightDialog;
     SureDialog mSureDialg;
 
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_demand_detail;
@@ -76,7 +78,7 @@ public class DemandDetailActivity extends BaseActivity<DemandDetailPresenter> im
      * @param bean
      */
     @Override
-    public void onRequirementDetail(RequirementBean bean, boolean isNeedEnrollment) {
+    public void onRequirementDetail(RequirementBean bean, boolean isNeedEnrollment, boolean displayCancel) {
         if (bean != null) {
             setLoadingVisible(false);
             setErrorVisible(false);
@@ -116,12 +118,22 @@ public class DemandDetailActivity extends BaseActivity<DemandDetailPresenter> im
             } else {
                 tvAcceptance.setVisibility(View.GONE);
             }
-            if (!isNeedEnrollment) {//是否可以报名
-                btnApply.setEnabled(false);
-                btnApply.setText(R.string.mine_has_apply);
-            } else {
+            if(bean.getIsOn()==0){
+                tvDown.setVisibility(View.VISIBLE);
+            }else{
+                tvDown.setVisibility(View.GONE);
+            }
+            if(displayCancel){
                 btnApply.setEnabled(true);
-                btnApply.setText(R.string.demand_need_apply);
+                btnApply.setText(R.string.cancel_apply);
+            }else{
+                if (!isNeedEnrollment) {//是否可以报名
+                    btnApply.setEnabled(false);
+                    btnApply.setText(R.string.mine_has_apply);
+                } else {
+                    btnApply.setEnabled(true);
+                    btnApply.setText(R.string.demand_need_apply);
+                }
             }
         }
     }

app/src/main/java/com/webrain/happywork/ui/adapter/listview/MineApplyListAdapter.java

@@ -63,6 +63,10 @@ public class MineApplyListAdapter extends BaseListAdapter<EnrollmentBean, MineAp
         Drawable d_success;
         @BindView(R.id.tv_stage)
         TextView tvStage;
+        @BindView(R.id.tv_cancel)
+        TextView tvCancel;
+        @BindView(R.id.tv_down)
+        TextView tvDown;
 
         public MineApplyViewHolder(Context mContext) {
             super(mContext);
@@ -84,20 +88,32 @@ public class MineApplyListAdapter extends BaseListAdapter<EnrollmentBean, MineAp
                 tvAddress.setText(obj.getHwRequirement() != null && TextUtils.isEmpty(obj.getHwRequirement().getProvinceCityCountry()) ? "" : obj.getHwRequirement().getProvinceCityCountry());
 
                 if (obj.getHwRequirement() != null && obj.getHwRequirement().getIsOn() == 0) {
-                    tvState.setTextColor(mContext.getResources().getColorStateList(R.color.text_gray_88));
-                    tvState.setBackgroundResource(R.color.bg_gray_f5);
-                    tvState.setCompoundDrawablesWithIntrinsicBounds(d_over, null, null, null);
-                    tvState.setText(R.string.demand_order_over);
-                } else if (TextUtils.isEmpty(obj.getOrderNumber())) {
-                    tvState.setTextColor(mContext.getResources().getColorStateList(R.color.text_gold));
-                    tvState.setBackgroundResource(R.color.text_yellow);
-                    tvState.setCompoundDrawablesWithIntrinsicBounds(d_going, null, null, null);
-                    tvState.setText(R.string.demand_going);
+                    tvDown.setVisibility(View.VISIBLE);
+                    tvPrice.setTextColor(mContext.getResources().getColor(R.color.text_black));
+                    tvStage.setTextColor(mContext.getResources().getColor(R.color.text_black));
+                }else{
+                    tvDown.setVisibility(View.GONE);
+                    tvPrice.setTextColor(mContext.getResources().getColor(R.color.text_blue_32));
+                    tvStage.setTextColor(mContext.getResources().getColor(R.color.text_blue_32));
+                }
+
+                if (obj.isDisplayCancel()) {
+                    tvCancel.setVisibility(View.VISIBLE);
+                    tvState.setVisibility(View.GONE);
                 } else {
-                    tvState.setTextColor(mContext.getResources().getColorStateList(R.color.text_blue_66));
-                    tvState.setBackgroundResource(R.color.text_blue_ee);
-                    tvState.setCompoundDrawablesWithIntrinsicBounds(d_success, null, null, null);
-                    tvState.setText(R.string.demand_order_finish);
+                    tvCancel.setVisibility(View.GONE);
+                    tvState.setVisibility(View.VISIBLE);
+                    if (TextUtils.isEmpty(obj.getOrderNumber())) {
+                        tvState.setTextColor(mContext.getResources().getColorStateList(R.color.text_gold));
+                        tvState.setBackgroundResource(R.color.text_yellow);
+                        tvState.setCompoundDrawablesWithIntrinsicBounds(d_going, null, null, null);
+                        tvState.setText(R.string.demand_going);
+                    } else {
+                        tvState.setTextColor(mContext.getResources().getColorStateList(R.color.text_blue_66));
+                        tvState.setBackgroundResource(R.color.text_blue_ee);
+                        tvState.setCompoundDrawablesWithIntrinsicBounds(d_success, null, null, null);
+                        tvState.setText(R.string.demand_order_finish);
+                    }
                 }
             }
         }

app/src/main/java/com/webrain/happywork/ui/mvp/contacts/DemandDetailContacts.java

@@ -7,7 +7,7 @@ import com.webrain.happywork.ui.base.IView;
 
 public class DemandDetailContacts {
     public interface IDemandDetailView extends IView {
-        void onRequirementDetail(RequirementBean bean, boolean needEnrollment);
+        void onRequirementDetail(RequirementBean bean, boolean needEnrollment, boolean displayCancel);
 
         void onShowMyLightDialog(boolean isInformationInit);
 
@@ -40,6 +40,8 @@ public class DemandDetailContacts {
 
         boolean isNeedEnrollment();
 
+        boolean isDisplayCancel();
+
         void setIsNeedEnrollment(boolean isNeedEnrollMent);
 
     }

app/src/main/java/com/webrain/happywork/ui/mvp/model/DemandDetailModel.java

@@ -23,6 +23,7 @@ import com.webrain.happywork.ui.mvp.contacts.DemandDetailContacts;
 public class DemandDetailModel extends BaseModel implements DemandDetailContacts.IDemandDetailModel {
     private String requirementId;
     private boolean needEnrollment;
+    private boolean displayCancel;
     private RequirementBean mBean;
 
     public DemandDetailModel(Context mContext) {
@@ -84,6 +85,7 @@ public class DemandDetailModel extends BaseModel implements DemandDetailContacts
                     if (data.getHwRequirementAPI() != null) {
                         mBean = data.getHwRequirementAPI();
                         needEnrollment = data.isNeedEnrollment();
+                        displayCancel = data.isDisplayCancel();
                     }
                     if (mBean != null)
                         callBack.onData(true);
@@ -123,6 +125,15 @@ public class DemandDetailModel extends BaseModel implements DemandDetailContacts
     }
 
     /**
+     * 返回是否可以取消
+     * @return
+     */
+    @Override
+    public boolean isDisplayCancel() {
+        return displayCancel;
+    }
+
+    /**
      * 设置是否可以报名
      *
      * @param isNeedEnrollment

app/src/main/java/com/webrain/happywork/ui/mvp/model/MineApplyListModel.java

@@ -41,7 +41,7 @@ public class MineApplyListModel extends BaseModel implements MineApplyListContac
         RetrofitHttpParams params = new RetrofitHttpParams(mContext);
         params.put("pageNo", pageNum + 1);
         params.put("pageSize", 10);
-        params.put("platform_id", AppCacheManager.getInstance().getLoginModel().getPlatformId());
+        params.put("platform_id", 5);
         new EnrollmentSubscribe(mContext).requestEnrollments(params.getRequestParams(), new ApiObserver<ApiApplyListBean>(mContext) {
             @Override
             public void onSuccess(ApiApplyListBean data) {

app/src/main/java/com/webrain/happywork/ui/mvp/presenter/DemandDetailPresenter.java

@@ -49,8 +49,7 @@ public class DemandDetailPresenter extends BasePresenter<DemandDetailActivity> i
                 public void onData(Object data) {
                     if (isViewAttach()) {
                         ToastUtils.show(mvpReference.get(), R.string.apply_success);
-                        mDemandDetailModel.setIsNeedEnrollment(false);
-                        mvpReference.get().onRequirementDetail(mDemandDetailModel.getRequirementBean(), mDemandDetailModel.isNeedEnrollment());
+                        getRequirementDetail(true);
                     }
                 }
 
@@ -75,7 +74,7 @@ public class DemandDetailPresenter extends BasePresenter<DemandDetailActivity> i
                 @Override
                 public void onData(Boolean data) {
                     if (isViewAttach()) {
-                        mvpReference.get().onRequirementDetail(mDemandDetailModel.getRequirementBean(), mDemandDetailModel.isNeedEnrollment());
+                        mvpReference.get().onRequirementDetail(mDemandDetailModel.getRequirementBean(), mDemandDetailModel.isNeedEnrollment(),mDemandDetailModel.isDisplayCancel());
                     }
                 }
 

app/src/main/res/drawable/corners_gray_88_5dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--圆角半径-->
+    <corners android:radius="5dp" />
+    <solid android:color="@color/text_gray_88" />
+</shape>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/white"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
@@ -181,7 +182,16 @@
 
         </LinearLayout>
     </ScrollView>
-
+    <TextView
+        android:id="@+id/tv_down"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:textColor="@color/white"
+        android:gravity="center"
+        android:visibility="gone"
+        android:background="@color/text_black_half40"
+        android:textSize="@dimen/px39_13sp"
+        android:text="@string/demand_is_down"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -20,15 +20,34 @@
             android:gravity="bottom"
             android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/tv_title"
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:singleLine="true"
-                android:text="连锁餐饮门店运营"
-                android:textColor="@color/text_black"
-                android:textSize="@dimen/px48_16sp" />
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:text="连锁餐饮门店运营"
+                    android:textColor="@color/text_black"
+                    android:textSize="@dimen/px48_16sp" />
+
+                <TextView
+                    android:id="@+id/tv_down"
+                    android:layout_width="48dp"
+                    android:layout_height="16dp"
+                    android:layout_marginLeft="3dp"
+                    android:background="@drawable/corners_gray_88_5dp"
+                    android:gravity="center"
+                    android:text="@string/demand_order_over"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/px33_11sp" />
+            </LinearLayout>
+
 
             <TextView
                 android:id="@+id/tv_price"
@@ -88,6 +107,18 @@
                 android:layout_height="1px"
                 android:layout_weight="1" />
 
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="65dp"
+                android:layout_height="23dp"
+                android:background="@drawable/corners_stork_blue_32_5dp"
+                android:gravity="center"
+                android:text="@string/cancel_apply"
+                android:textColor="@color/text_blue_32"
+                android:textSize="@dimen/px36_12sp"
+                android:visibility="gone" />
+
             <TextView
                 android:id="@+id/tv_state"
                 android:layout_width="wrap_content"

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

@@ -5,6 +5,7 @@
     <color name="colorAccent">#D81B60</color>
 
     <color name="white">#ffffff</color>
+    <color name="text_black_half40">#66000000</color>
     <color name="text_black">#31364C</color>
     <color name="text_blue_32">#3243BD</color>
     <color name="text_blue_66">#669BB4</color>

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

@@ -129,4 +129,6 @@
     <string name="error_toast_name">请输入姓名</string>
     <string name="error_toast_id">请输入身份证号</string>
     <string name="error_toast_id_18">请输入18位身份证号</string>
+    <string name="cancel_apply">取消报名</string>
+    <string name="demand_is_down">需求已经下架啦~</string>
 </resources>