1.修复接口弹窗不可取消设置不生效bug

2.动态配置平台id

app/build.gradle

@@ -23,8 +23,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 115
-        versionName "1.1.5"
+        versionCode 117
+        versionName "1.1.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
         ndk {
@@ -35,12 +35,14 @@ android {
     productFlavors {
         hwpro {
             applicationId "com.webrain.happywork"
-            buildConfigField('String', 'VERIFY_URL', "\"https://dk.hap-job.com/captcha/captcha?phone=\"")
+            buildConfigField('String', 'VERIFY_URL', "\"http://cw.dal-pay.com/captcha/captcha?phone=\"")
+            buildConfigField('int', 'PLATFORM_ID', "1")
             buildConfigField('String', 'baseApiUrl', proApiUrl)
         }
         hwtest {
             applicationId "com.webrain.happywork.test"
             buildConfigField('String', 'VERIFY_URL', "\"http://yz.hap-job.com/captcha/captcha?phone=\"")
+            buildConfigField('int', 'PLATFORM_ID', "5")
             buildConfigField('String', 'baseApiUrl', testApiUrl)
         }
     }

app/src/main/java/com/webrain/happywork/http/ApiFileObserver.java

@@ -68,7 +68,7 @@ public abstract class ApiFileObserver<T> implements Observer<T> {
     @Override
     public void onSubscribe(Disposable d) {
         if (isShowLoading) {
-            mProgressDialog = new ProgressDialog(contextWeakReference.get());
+            mProgressDialog = new ProgressDialog(contextWeakReference.get(), isCancelable);
             if (!TextUtils.isEmpty(dialogMessage))
                 mProgressDialog.setTitle(dialogMessage);
             mProgressDialog.show();

app/src/main/java/com/webrain/happywork/http/ApiObserver.java

@@ -69,7 +69,7 @@ public abstract class ApiObserver<T> implements Observer<ApiResultBean<T>> {
     @Override
     public void onSubscribe(Disposable d) {
         if (isShowLoading) {
-            mProgressDialog = new ProgressDialog(contextWeakReference.get());
+            mProgressDialog = new ProgressDialog(contextWeakReference.get(),isCancelable);
             if (!TextUtils.isEmpty(dialogMessage))
                 mProgressDialog.setTitle(dialogMessage);
             mProgressDialog.show();

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

@@ -9,6 +9,7 @@ import android.text.TextUtils;
 import com.webrain.baselibrary.utils.AppUtils;
 import com.webrain.baselibrary.utils.PermissionsUtils;
 import com.webrain.happywork.AppCacheManager;
+import com.webrain.happywork.BuildConfig;
 import com.webrain.happywork.bean.AreaBean;
 import com.webrain.happywork.bean.BaseInformationBean;
 import com.webrain.happywork.bean.CityBean;
@@ -64,7 +65,7 @@ public class MainModel extends BaseModel implements MainContacts.IMainModel {
         RetrofitHttpParams params = new RetrofitHttpParams(mContext);
         params.put("pageNo", pageNum + 1);
         params.put("pageSize", 10);
-        params.put("platform_id", 5);
+        params.put("platform_id", BuildConfig.PLATFORM_ID);
         if (!TextUtils.isEmpty(priceType))
             params.put("priceType", priceType);
         if (!TextUtils.isEmpty(tradeType))

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

@@ -6,6 +6,7 @@ import android.content.Context;
 import com.webrain.baselibrary.EventConstant;
 import com.webrain.baselibrary.event.TagValueEvent;
 import com.webrain.happywork.AppCacheManager;
+import com.webrain.happywork.BuildConfig;
 import com.webrain.happywork.bean.EnrollmentBean;
 import com.webrain.happywork.bean.api.ApiApplyListBean;
 import com.webrain.happywork.bean.base.ApiNormalBean;
@@ -48,7 +49,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", 5);
+        params.put("platform_id", BuildConfig.PLATFORM_ID);
         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/model/MineOrderDetailModel.java

@@ -32,6 +32,7 @@ public class MineOrderDetailModel extends BaseModel implements MineOrderDetailCo
     private String mOrderId;
     private RequirementBean mRequirementBean;
     private OrderBean mOrderBean;
+    private boolean isSureLoading = false;//是否确认订单中
 
     public MineOrderDetailModel(Context mContext) {
         super(mContext);
@@ -93,9 +94,12 @@ public class MineOrderDetailModel extends BaseModel implements MineOrderDetailCo
      */
     @Override
     public void requestOrderSure(final MvpDataCallBack<Object> callBack) {
+        if (isSureLoading)
+            return;
+        isSureLoading = true;
         RetrofitHttpParams params = new RetrofitHttpParams(mContext);
         params.put("orderId", mOrderId);
-        new OrderSubscribe(mContext).requestConfirmOrder(params.getRequestParams(), new ApiObserver<ApiNormalBean>(mContext) {
+        new OrderSubscribe(mContext).requestConfirmOrder(params.getRequestParams(), new ApiObserver<ApiNormalBean>(mContext, true, false) {
             @Override
             public void onSuccess(ApiNormalBean data) {
                 mOrderBean.setStatus(AppConstant.ORDER_STATE_SURE);
@@ -110,6 +114,7 @@ public class MineOrderDetailModel extends BaseModel implements MineOrderDetailCo
 
             @Override
             public void onFinish() {
+                isSureLoading = false;
             }
         });
     }

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

@@ -32,6 +32,7 @@ public class MineOrderListModel extends BaseModel implements MineOrderListContac
     private boolean isLoading = false;//是否加载中
     private int pageNum = 0;//第一页为1开始 初始为0
     private boolean isLastPage;//是否已经最后一页
+    private boolean isSureLoading = false;//是否确认订单中
 
     public MineOrderListModel(Context mContext) {
         super(mContext);
@@ -93,9 +94,12 @@ public class MineOrderListModel extends BaseModel implements MineOrderListContac
      */
     @Override
     public void requestOrderSure(final MvpDataCallBack<Object> callBack, OrderBean bean) {
+        if (isSureLoading)
+            return;
+        isSureLoading = true;
         RetrofitHttpParams params = new RetrofitHttpParams(mContext);
         params.put("orderId", bean.getId());
-        new OrderSubscribe(mContext).requestConfirmOrder(params.getRequestParams(), new ApiObserver<ApiNormalBean>(mContext,true) {
+        new OrderSubscribe(mContext).requestConfirmOrder(params.getRequestParams(), new ApiObserver<ApiNormalBean>(mContext, true, false) {
             @Override
             public void onSuccess(ApiNormalBean data) {
                 callBack.onData(data);
@@ -109,12 +113,14 @@ public class MineOrderListModel extends BaseModel implements MineOrderListContac
 
             @Override
             public void onFinish() {
+                isSureLoading = false;
             }
         });
     }
 
     /**
      * 请求订单签约
+     *
      * @param callBack
      * @param bean
      */
@@ -122,7 +128,7 @@ public class MineOrderListModel extends BaseModel implements MineOrderListContac
     public void requestOrderSign(final MvpDataCallBack<String> callBack, OrderBean bean) {
         RetrofitHttpParams params = new RetrofitHttpParams(mContext);
         params.put("orderId", bean.getId());
-        new OrderSubscribe(mContext).requestConfirmECOrder(params.getRequestParams(), new ApiObserver<ApiSignBean>(mContext,true) {
+        new OrderSubscribe(mContext).requestConfirmECOrder(params.getRequestParams(), new ApiObserver<ApiSignBean>(mContext, true) {
             @Override
             public void onSuccess(ApiSignBean data) {
                 callBack.onData(data.getUrl());

app/src/main/java/com/webrain/happywork/ui/widget/dialog/ProgressDialog.java

@@ -15,11 +15,13 @@ public class ProgressDialog {
     private Dialog mDialog;
     private ViewHolder mViewHolder;
 
-    public ProgressDialog(final Context mContext) {
+    public ProgressDialog(final Context mContext,boolean isCancelable) {
         this.mContext = mContext;
         mViewHolder = new ViewHolder(mContext);
         mDialog = new Dialog(mContext, R.style.HappyJobDialog);
         mDialog.setContentView(mViewHolder.getView());
+        mDialog.setCancelable(isCancelable);
+        mDialog.setCanceledOnTouchOutside(isCancelable);
     }