Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6d085b6c
authored
6 years ago
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
android 1.9.2
parent
5c6afc8c
master
…
dev
dev_xx
dev_xx_241116
dev_xx_250108_toast
dev_xx_250224_report
dev_xx_250414_sop
dev_xx_web
test
v2.7.2
v2.7.1
v2.7.0
v2.6.9
v2.6.7
v2.6.6
v2.6.5
v2.6.4
v2.6.3
v2.6.2
v2.6.1
v2.6.0
v2.5.9
v2.5.7
v2.5.5
v2.5.4
v2.5.3
v2.5.2
v2.5.0
v2.4.6
v2.4.5
v2.4.0
v_2.4.0
v2.3.2
v2.3.1
dev20230405
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
4 deletions
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
View file @
6d085b6c
...
...
@@ -85,7 +85,6 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
}
else
{
commitePhoto
();
}
}
}
...
...
@@ -189,7 +188,9 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
}
else
if
(
2
==
(
detail
.
getRepairType
()))
{
mRepairType
=
UIUtils
.
getString
(
R
.
string
.
payer_baowai
);
}
if
(
mOrderType
!=
1
){
mView
.
setRepairType
();
}
mNeedEsignature
=
detail
.
getNeedEsignature
();
if
(
mNeedEsignature
!=
null
&&
mNeedEsignature
==
1
)
{
mView
.
showSignature
();
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
View file @
6d085b6c
...
...
@@ -169,9 +169,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
params
.
put
(
"servicePriceComment"
,
""
);
// params.put("categoryName")
params
.
put
(
"brandName"
,
brandName
);
params
.
put
(
"productModel"
,
productModel
);
params
.
put
(
"sn"
,
sn
);
//
params.put("brandName", brandName);
//
params.put("productModel", productModel);
//
params.put("sn", sn);
params
.
put
(
"repairType"
,
repairType
);
//照片上传
if
(
imageUrl
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
View file @
6d085b6c
...
...
@@ -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
...
...
@@ -261,6 +274,8 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
}
else
if
(
mUploadMessage
!=
null
)
{
mUploadMessage
.
onReceiveValue
(
uri
);
}
}
else
{
cancelFilePathCallback
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment