增加查看结果

54740205 · 罗翻 · 21d411a8 · 54740205 · 54740205 · 54740205
Commit 54740205 authored Apr 26, 2018 by 罗翻
Showing with 24 additions and 7 deletions
app/proguard-rules.pro
baseSDK/src/main/java/com/dayu/common/Constants.java
orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -196,6 +196,10 @@ public static java.lang.String TABLENAME;
 -keep class com.amap.api.location.**{*;}
 -keep class com.amap.api.fence.**{*;}
 -keep class com.autonavi.aps.amapapi.model.**{*;}
+#2D地图
+-keep class com.amap.api.maps2d.**{*;}
+-keep class com.amap.api.mapcore2d.**{*;}
+-dontwarn com.amap.api.**
 #友盟

--- a/baseSDK/src/main/java/com/dayu/common/Constants.java
+++ b/baseSDK/src/main/java/com/dayu/common/Constants.java
@@ -17,6 +17,8 @@ public class Constants {
    public static final String BASE_URL = "http://47.94.101.239:3112";
    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
    public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
+    //    public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
+    public final static String WEB_SOP_DETAIL = "http://192.168.2.172:8080/#/sopdetail";
    public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
    public static final boolean IS_DEBUG = true;
@@ -28,6 +30,7 @@ public class Constants {
 //    public static final String BASE_URL = "http://47.95.223.6:3112";
 //    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
 //    public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
+//    public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
 //    public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
 //    public static final boolean IS_DEBUG = true;
@@ -39,6 +42,7 @@ public class Constants {
 //    public static final String BASE_URL = "https://mobile.kf.ai";
 //    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
 //    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
+//    public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
 //    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
 //    public static final boolean IS_DEBUG = false;
@@ -50,6 +54,7 @@ public class Constants {
 //    public final static String BASE_URL = "http://test.mobile.dayu.ai";
 //    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
 //    public final static String WEB_SOP = "http://test.sop.dayu.ai/#/sop";
+//    public final static String WEB_SOP_DETAIL = "http://test.sop.dayu.ai/#/sopdetail";
 //    public final static String WEB_ZHI_SHI = "http://test.sop.dayu.ai/#/detail";
 //    public final static  boolean IS_DEBUG = true;

--- a/orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/orderserver/OrderServerPresenter.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import com.dayu.common.Constants;
 import com.dayu.location.base.BaseMapActivity;
 import com.dayu.order.api.protocol.OrderDetail;
-import com.dayu.order.common.OrderConstant;
 import com.dayu.order.ui.activity.CheckContentActivity;
 import com.dayu.order.ui.activity.SopWebViewActivity;
 import com.dayu.utils.ToastUtils;
@@ -15,8 +14,8 @@ import java.util.Collections;
 import java.util.List;
 import static com.dayu.common.Constants.ORDER_ID;
-import static com.dayu.common.Constants.ORDER_POSTION;
 import static com.dayu.common.Constants.ORDER_STATE;
+import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
 /**
 * Created by luofan
@@ -54,11 +53,12 @@ public class OrderServerPresenter extends OrderServerContract.Presenter {
    public void dumpToSop() {
        Bundle bundle = new Bundle();
        bundle.putInt(ORDER_ID, mDetails.getId());
+        bundle.putInt(ORDER_STATE, ORDER_SOP_FINISH);
        mView.startActivity(SopWebViewActivity.class, bundle);
    }
    @Override
-    public void dumpCheckContent(int postion,int state) {
+    public void dumpCheckContent(int postion, int state) {
        Bundle bundle = new Bundle();
        bundle.putSerializable(Constants.ORDER_DETAIL, mDetails);
        bundle.putInt(Constants.ORDER_POSTION, postion);

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
@@ -16,6 +16,7 @@ import com.dayu.base.ui.activity.DataBindingActivity;
 import com.dayu.common.Constants;
 import com.dayu.event.UserInfo;
 import com.dayu.order.R;
+import com.dayu.order.common.OrderConstant;
 import com.dayu.order.databinding.ActivityWebviewBinding;
 import com.dayu.provider.event.OrderState;
 import com.dayu.utils.ProgressUtil;
@@ -35,7 +36,8 @@ import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
 /**
- * Created by luofan on 2017/11/27.
+ * Created by luofan
+ * on 2017/11/27.
 */
 public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBinding> {
@@ -47,6 +49,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
    int RESULT_CODE = 0;
    int RESULT_CODE_FOR_Lollipop = 1;
    private BridgeWebView mWebView;
+    private int mState;
    @Override
    public int getLayoutId() {
@@ -60,6 +63,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
        Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
        mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
        mPositon = bundle.getInt(Constants.ORDER_POSTION, 0);
+        mState = bundle.getInt(Constants.ORDER_STATE, 0);
        mBind.titleBack.setOnClickListener(o -> finish());
        mWebView = new BridgeWebView(mActivity);
        mWebView.setLayoutParams(new LinearLayout.LayoutParams(
@@ -133,7 +137,12 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
            }
        });
        ProgressUtil.startLoad(mActivity);
-        mWebView.loadUrl(Constants.WEB_SOP);
+        if (mState == OrderConstant.ORDER_SOP_FINISH) {
+            mWebView.loadUrl(Constants.WEB_SOP_DETAIL);
+        } else {
+            mWebView.loadUrl(Constants.WEB_SOP);
+        }
        JSONObject jsonObject = new JSONObject();
        try {

--- a/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
@@ -10,7 +10,6 @@ import com.dayu.order.R;
 import com.dayu.order.api.protocol.OrderDetail;
 import com.dayu.order.databinding.ServeDatailsItemBinding;
 import com.dayu.order.presenter.orderserver.OrderServerPresenter;
-import com.dayu.utils.ToastUtils;
 import com.dayu.utils.UIUtils;
 /**
@@ -95,7 +94,7 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv
            holder.serverCheck.setOnClickListener(v -> presenter.dumpMap(item.getLatitude(), item.getLongitude(), item.getAddress()));
        }
        if ("查看结果".equals(item.getCommentName())) {
-            holder.serverCheck.setOnClickListener(v -> ToastUtils.showShortToast("查看结果"));
+            holder.serverCheck.setOnClickListener(v -> presenter.dumpToSop());
        }
    }
 }