增加签名和sn码

d46bcf9d · 罗翻 · 6af78c69 · d46bcf9d · d46bcf9d · d46bcf9d
Commit d46bcf9d authored Jun 15, 2018 by 罗翻
Showing with 73 additions and 4 deletions
userCenter/src/main/res/layout/dialog_image.xml → baseSDK/src/main/res/layout/dialog_image.xml
locationComponent/src/main/java/com/dayu/location/base/LocationUtils.java
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
orderCenter/src/main/res/layout/fragment_multi_detail.xml
--- a/userCenter/src/main/res/layout/dialog_image.xml
+++ b/userCenter/src/main/res/layout/dialog_image.xml
@@ -8,5 +8,5 @@
    <ImageView
        android:id="@+id/large_image"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="167dp" />
 </LinearLayout>
\ No newline at end of file
--- a/locationComponent/src/main/java/com/dayu/location/base/LocationUtils.java
+++ b/locationComponent/src/main/java/com/dayu/location/base/LocationUtils.java
@@ -114,7 +114,6 @@ public class LocationUtils {
        if (mlocationClient != null) {
            mlocationClient.onDestroy();
        }
-        mlocationClient = null;
        mListener = null;
    }

--- a/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
+++ b/orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
@@ -74,6 +74,15 @@ public class OrderDetail implements Serializable {
    private List<Spu> spus;
    private Integer needEsignature;//1:需要2：不需要.
    private String esignatureImg;
+    private Integer payStatus;//或null:未支付 2.已支付3.支付成功4.支付失败
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
    public Integer getNeedEsignature() {
        return needEsignature;

--- a/orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
+++ b/orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
@@ -27,7 +27,7 @@ public class Spu implements Serializable, Parcelable {
    private String productModel;
    private String providerTypeName;
    private String time;
-    private int status;
+    private int status;//1未完成2已完成
    private String brandName;
    private String sn;
    /**

--- a/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
@@ -25,6 +25,8 @@ public interface MultipleProcessContract {
        ArrayList<String> getImages();
        void showSignature();
+        void setPayStatus();
    }
    abstract class Presenter extends BaseListPresenter<View> {

--- a/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
@@ -41,6 +41,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter 
    private ArrayList<String> mImages = new ArrayList<>();
    private Integer mNeedEsignature;
    private String mSignatureUrl;
+    private boolean canPay;
    @Override
    public void onAttached() {
@@ -172,6 +173,11 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter 
            if (mNeedEsignature == 1) {
                mView.showSignature();
            }
+            Integer isPay = detail.getIsPay();
+            Integer payState = detail.getPayStatus();
+            if (isPay == 2 && payState == 3) {
+               mView.setPayStatus();
+            }
        }));
    }
@@ -182,4 +188,5 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter 
    public int getOrderType() {
        return mOrderType;
    }
 }
--- a/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
@@ -206,6 +206,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
                            BaseApiFactory.uploadPhoto(snParts).subscribe(baseObserver(
                                    list1 -> commitOrder(list, list1)));
                        }
+                    } else {
+                        commitOrder(list, null);
                    }
                }));
            }

--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
@@ -20,6 +20,7 @@ import com.dayu.order.databinding.ActivityMultipleProcessBinding;
 import com.dayu.order.presenter.multipleprocess.MultipleProcessContract;
 import com.dayu.order.presenter.multipleprocess.MultipleProcessPresenter;
 import com.dayu.utils.GlideImageLoader;
+import com.dayu.utils.ToastUtils;
 import com.dayu.utils.UIUtils;
 import com.dayu.utils.UtilsScreen;
 import com.dayu.widgets.SwitchImage;
@@ -60,6 +61,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    private TextView mIcon;
    private LinearLayout mSignature;
    private boolean isShowSignature;
+    private SwitchImage swtich;
+    private boolean canPay;
    @Override
    public void setPresenter() {
@@ -90,7 +93,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    public void initFootView() {
        View view = mBind.recyclerView.getChildAt(0);
-        SwitchImage swtich = view.findViewById(R.id.iv_switch);
+        swtich = view.findViewById(R.id.iv_switch);
        RelativeLayout rlPay = view.findViewById(R.id.rl_pay);
        LinearLayout signature = view.findViewById(R.id.rl_signature);
        if (signature == null) {
@@ -111,6 +114,9 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
        mIcon = view.findViewById(R.id.tv_icon);
        swtich.setOnClickListener(v -> {
+            if (true) {
+                ToastUtils.showShortToast("您上次已经收取过客户费用，请勿重新收取!");
+            } else {
                if (swtich.getSwitchButton()) {
                    swtich.setSwitchButton(false);
                    rlPay.setVisibility(View.GONE);
@@ -122,6 +128,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
                    mBind.recyclerView.scrollBottom();
                    isPay = 2;
                }
+            }
        });
        if (mPresenter.getOrderType() == 1) {
@@ -283,6 +290,14 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
    }
    @Override
+    public void setPayStatus() {
+        canPay = true;
+        swtich.setOnClickListener(v -> {
+            ToastUtils.showShortToast("您上次已经收取过客户费用，请勿重新收取!");
+        });
+    }
+    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        super.onActivityResult(requestCode, resultCode, data);
        if (resultCode == RESULT_OK) {

--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
@@ -2,8 +2,11 @@ package com.dayu.order.ui.fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
 import com.dayu.base.ui.adapter.CoreAdapter;
 import com.dayu.base.ui.fragment.DataBindingFragment;
@@ -19,6 +22,7 @@ import com.dayu.order.databinding.ItemDetailServerInfoBinding;
 import com.dayu.order.ui.activity.PdfWebViewActivity;
 import com.dayu.order.ui.activity.QrCodeActivity;
 import com.dayu.order.ui.activity.ServerInstructionActivity;
+import com.dayu.utils.GlideImageLoader;
 import com.dayu.utils.ToastUtils;
 import com.dayu.widgets.listener.OnItemClickListener;
 import com.umeng.analytics.MobclickAgent;
@@ -93,6 +97,10 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
            startActivity(new Intent(mActivity, QrCodeActivity.class));
            MobclickAgent.onEvent(mActivity, "customer_apponitment");
        });
+        if (detail.getEsignatureImg() == null) {
+            mBind.customerSignature.setVisibility(View.GONE);
+        }
+        mBind.customerSignature.setOnClickListener(v -> imgMax(detail.getEsignatureImg()));
    }
    public String getStaus(int staus) {
@@ -131,4 +139,15 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
    public int getLayoutId() {
        return R.layout.fragment_multi_detail;
    }
+    public void imgMax(String url) {
+        LayoutInflater inflater = LayoutInflater.from(mActivity);
+        View imgEntryView = inflater.inflate(R.layout.dialog_image, null);
+        final AlertDialog dialog = new AlertDialog.Builder(mActivity).create();
+        ImageView img = imgEntryView.findViewById(R.id.large_image);
+        GlideImageLoader.load(mActivity, url, img);
+        dialog.setView(imgEntryView);
+        dialog.show();
+        imgEntryView.setOnClickListener(paramView -> dialog.cancel());
+    }
 }
--- a/orderCenter/src/main/res/layout/fragment_multi_detail.xml
+++ b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
@@ -262,6 +262,21 @@
                        android:textSize="14sp" />
                    <TextView
+                        android:id="@+id/customer_signature"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="19dp"
+                        android:layout_below="@+id/tv_customer_type"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="@dimen/dp_15"
+                        android:gravity="right"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:layout_toRightOf="@+id/customer_name"
+                        android:text="查看签名"
+                        android:textColor="@color/bg_button"
+                        android:textSize="14sp" />
+                    <TextView
                        android:id="@+id/tv_customer_mobile"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"