1.修复订单详情确认订单没有跳转至在线合同的地方

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

@@ -152,7 +152,7 @@ public class MineOrderDetailActivity extends BaseActivity<MineOrderDetailPresent
                 }, Manifest.permission.WRITE_EXTERNAL_STORAGE);
                 break;
             case R.id.btn_sure:
-                mvpPresenter.requestOrderSure();
+                mvpPresenter.requestOrder();
                 break;
         }
     }

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

@@ -20,8 +20,12 @@ public class MineOrderDetailContacts {
 
         void getOrderDetail();
 
+        void requestOrder();
+
         void requestOrderSure();
 
+        void requestOrderSign();
+
         void downWorkContract();
     }
 
@@ -32,6 +36,8 @@ public class MineOrderDetailContacts {
 
         void requestOrderSure(MvpDataCallBack<Object> callBack);
 
+        void requestOrderSign(MvpDataCallBack<String> callBack);
+
         void downWorkContract(MvpDataCallBack<String> callBack, String filePath);
 
         RequirementBean getRequirementBean();

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

@@ -10,6 +10,7 @@ import com.webrain.happywork.AppCacheManager;
 import com.webrain.happywork.bean.OrderBean;
 import com.webrain.happywork.bean.RequirementBean;
 import com.webrain.happywork.bean.api.ApiOrderDetailBean;
+import com.webrain.happywork.bean.api.ApiSignBean;
 import com.webrain.happywork.bean.base.ApiNormalBean;
 import com.webrain.happywork.callback.MvpDataCallBack;
 import com.webrain.happywork.http.ApiFileObserver;
@@ -114,6 +115,32 @@ public class MineOrderDetailModel extends BaseModel implements MineOrderDetailCo
     }
 
     /**
+     * 请求订单签约
+     *
+     * @param callBack
+     */
+    @Override
+    public void requestOrderSign(final MvpDataCallBack<String> callBack) {
+        RetrofitHttpParams params = new RetrofitHttpParams(mContext);
+        params.put("orderId", mOrderId);
+        new OrderSubscribe(mContext).requestConfirmECOrder(params.getRequestParams(), new ApiObserver<ApiSignBean>(mContext, true) {
+            @Override
+            public void onSuccess(ApiSignBean data) {
+                callBack.onData(data.getUrl());
+            }
+
+            @Override
+            public void onError(ApiSignBean data, ApiException exception) {
+                super.onError(data, exception);
+            }
+
+            @Override
+            public void onFinish() {
+            }
+        });
+    }
+
+    /**
      * 下载合同
      *
      * @param callBack

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

@@ -1,14 +1,20 @@
 package com.webrain.happywork.ui.mvp.presenter;
 
 
+import android.content.Intent;
+import android.text.TextUtils;
+
 import com.webrain.baselibrary.EventConstant;
+import com.webrain.baselibrary.IntentConstant;
 import com.webrain.baselibrary.event.TagValueEvent;
 import com.webrain.baselibrary.utils.ToastUtils;
 import com.webrain.happywork.AppCacheManager;
 import com.webrain.happywork.R;
 import com.webrain.happywork.callback.MvpDataCallBack;
 import com.webrain.happywork.http.exception.ApiException;
+import com.webrain.happywork.sdk.fdd.FDDWebViewActivity;
 import com.webrain.happywork.ui.activity.MineOrderDetailActivity;
+import com.webrain.happywork.ui.activity.MineOrderListActivity;
 import com.webrain.happywork.ui.base.BasePresenter;
 import com.webrain.happywork.ui.mvp.contacts.MineOrderDetailContacts;
 import com.webrain.happywork.ui.mvp.model.MineOrderDetailModel;
@@ -62,6 +68,19 @@ public class MineOrderDetailPresenter extends BasePresenter<MineOrderDetailActiv
     }
 
     /**
+     * 订单确认处理
+     */
+    @Override
+    public void requestOrder() {
+        if (isViewAttach() && mMineOrderDetailModel.isValidity(false))
+            if (mMineOrderDetailModel.getOrderBean().getContractType() == 2) {
+                requestOrderSign();
+            } else {
+                requestOrderSure();
+            }
+    }
+
+    /**
      * 确认订单
      */
     @Override
@@ -81,6 +100,25 @@ public class MineOrderDetailPresenter extends BasePresenter<MineOrderDetailActiv
     }
 
     /**
+     * 签约订单
+     */
+    @Override
+    public void requestOrderSign() {
+        if (isViewAttach() && mMineOrderDetailModel.isValidity(false)) {
+            mMineOrderDetailModel.requestOrderSign(new MvpDataCallBack<String>() {
+                @Override
+                public void onData(String data) {
+                    if (isViewAttach() && !TextUtils.isEmpty(data)) {
+                        Intent intent = new Intent(mvpReference.get(), FDDWebViewActivity.class);
+                        intent.putExtra(IntentConstant.URL, data);
+                        mvpReference.get().startActivity(intent);
+                    }
+                }
+            });
+        }
+    }
+
+    /**
      * 下载
      */
     @Override