Commit 6d085b6c by 罗翻

android 1.9.2

parent 5c6afc8c
...@@ -85,7 +85,6 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -85,7 +85,6 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
} else { } else {
commitePhoto(); commitePhoto();
} }
} }
} }
...@@ -189,7 +188,9 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -189,7 +188,9 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
} else if (2 == (detail.getRepairType())) { } else if (2 == (detail.getRepairType())) {
mRepairType = UIUtils.getString(R.string.payer_baowai); mRepairType = UIUtils.getString(R.string.payer_baowai);
} }
mView.setRepairType(); if (mOrderType!=1){
mView.setRepairType();
}
mNeedEsignature = detail.getNeedEsignature(); mNeedEsignature = detail.getNeedEsignature();
if (mNeedEsignature != null && mNeedEsignature == 1) { if (mNeedEsignature != null && mNeedEsignature == 1) {
mView.showSignature(); mView.showSignature();
......
...@@ -169,9 +169,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -169,9 +169,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
params.put("servicePriceComment", ""); params.put("servicePriceComment", "");
// params.put("categoryName") // params.put("categoryName")
params.put("brandName", brandName); // params.put("brandName", brandName);
params.put("productModel", productModel); // params.put("productModel", productModel);
params.put("sn", sn); // params.put("sn", sn);
params.put("repairType", repairType); params.put("repairType", repairType);
//照片上传 //照片上传
if (imageUrl != null) { if (imageUrl != null) {
......
...@@ -241,6 +241,19 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi ...@@ -241,6 +241,19 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
} }
/** /**
* 取消mFilePathCallback回调
*/
private void cancelFilePathCallback() {
if (uploadMessageAboveL != null) {
uploadMessageAboveL.onReceiveValue(null);
uploadMessageAboveL = null;
} else if (mUploadMessage != null) {
mUploadMessage.onReceiveValue(null);
mUploadMessage = null;
}
}
/**
* 上传文件回调 * 上传文件回调
*/ */
@Override @Override
...@@ -261,6 +274,8 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi ...@@ -261,6 +274,8 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
} else if (mUploadMessage != null) { } else if (mUploadMessage != null) {
mUploadMessage.onReceiveValue(uri); mUploadMessage.onReceiveValue(uri);
} }
} else {
cancelFilePathCallback();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment