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
106937d5
authored
4 years ago
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单提交验收页代商家收款功能改版
parent
40374a06
dev_xx_web
…
dev
dev_xx
dev_xx_241116
dev_xx_250108_toast
dev_xx_250224_report
v2.7.2
dev20230405
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
28 deletions
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
orderCenter/src/main/res/layout/item_multi_process_foot.xml
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
View file @
106937d5
...
...
@@ -80,6 +80,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private
LinearLayout
llPaywayNotice
;
private
ImageView
mScan
;
private
TextView
mTvScan
;
private
TextView
mTvPayTitle
;
private
LinearLayout
llPayWay
;
private
RelativeLayout
mRlPay
;
private
boolean
mWechatStatus
;
...
...
@@ -128,6 +130,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mTvScan
=
view
.
findViewById
(
R
.
id
.
tv_scan_pay
);
llScanPay
=
view
.
findViewById
(
R
.
id
.
ll_scan_pay
);
llPaywayNotice
=
view
.
findViewById
(
R
.
id
.
ll_payway_notice
);
mTvPayTitle
=
view
.
findViewById
(
R
.
id
.
tv_palyer_title
);
llPayWay
=
view
.
findViewById
(
R
.
id
.
switch_view
);
mNoPay
.
setOnClickListener
(
v
->
{
if
(
isSpmOrder
)
{
...
...
@@ -442,41 +446,58 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
isShowSignature
=
true
;
}
// @Override
// public void setPayType(int type) {
// mPayType = type;
// switch (type) {
// case 1:
// setPayWayBackGround(mWechatPay);
// mRlPay.setVisibility(View.VISIBLE);
// llScanPay.setVisibility(View.VISIBLE);
// llPaywayNotice.setVisibility(View.VISIBLE);
// mScanPay.setVisibility(View.VISIBLE);
// break;
// case 3:
// setPayWayBackGround(mNoPay);
// break;
// case 4:
// setPayWayBackGround(mPublicPay);
// mRlPay.setVisibility(View.VISIBLE);
// llScanPay.setVisibility(View.GONE);
// break;
// }
// }
@Override
public
void
setPayType
(
int
type
)
{
mPayType
=
type
;
switch
(
type
){
case
1
:
setPayWayBackGround
(
mWechatPay
);
mRlPay
.
setVisibility
(
View
.
VISIBLE
);
// if (Double.parseDouble(getTotalMoney()) > 0){
llScanPay
.
setVisibility
(
View
.
VISIBLE
);
llPaywayNotice
.
setVisibility
(
View
.
VISIBLE
);
mScanPay
.
setVisibility
(
View
.
VISIBLE
);
// }else {
// llScanPay.setVisibility(View.GONE);
// llPaywayNotice.setVisibility(View.GONE);
// mScanPay.setVisibility(View.GONE);
// mPresenter.setmCanProcess(true);
// }
break
;
case
3
:
setPayWayBackGround
(
mNoPay
);
break
;
case
4
:
setPayWayBackGround
(
mPublicPay
);
mRlPay
.
setVisibility
(
View
.
VISIBLE
);
llScanPay
.
setVisibility
(
View
.
GONE
);
break
;
if
(
type
==
1
){
llPayWay
.
setVisibility
(
View
.
VISIBLE
);
mWechatPay
.
setVisibility
(
View
.
VISIBLE
);
setPayWayBackGround
(
mWechatPay
);
mRlPay
.
setVisibility
(
View
.
VISIBLE
);
llScanPay
.
setVisibility
(
View
.
VISIBLE
);
llPaywayNotice
.
setVisibility
(
View
.
VISIBLE
);
mScanPay
.
setVisibility
(
View
.
VISIBLE
);
mTvPayTitle
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
llPayWay
.
setVisibility
(
View
.
GONE
);
mWechatPay
.
setVisibility
(
View
.
GONE
);
mRlPay
.
setVisibility
(
View
.
GONE
);
llScanPay
.
setVisibility
(
View
.
GONE
);
llPaywayNotice
.
setVisibility
(
View
.
GONE
);
mScanPay
.
setVisibility
(
View
.
GONE
);
mTvPayTitle
.
setVisibility
(
View
.
GONE
);
}
}
@Override
public
void
setOrderSource
(
int
source
)
{
//1,5服务站/服务商 4,6小程序/EU
if
(
source
==
1
||
source
==
5
){
if
(
source
==
1
||
source
==
5
)
{
isSpmOrder
=
true
;
}
else
{
}
else
{
isSpmOrder
=
false
;
}
mServerPrice
.
setEnabled
(!
isSpmOrder
);
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/res/layout/item_multi_process_foot.xml
View file @
106937d5
...
...
@@ -14,6 +14,7 @@
android:orientation=
"vertical"
>
<TextView
android:visibility=
"gone"
android:id=
"@+id/tv_palyer_title"
android:layout_width=
"match_parent"
android:layout_height=
"43dp"
...
...
@@ -29,7 +30,8 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_54"
android:background=
"@color/cl_white"
android:visibility=
"gone"
>
android:visibility=
"gone"
>
<TextView
android:id=
"@+id/tv_player"
...
...
@@ -102,7 +104,8 @@
android:layout_marginTop=
"@dimen/dp_27"
android:background=
"@color/cl_white"
android:orientation=
"vertical"
android:visibility=
"gone"
>
android:visibility=
"gone"
>
<TextView
android:layout_width=
"wrap_content"
...
...
@@ -143,6 +146,7 @@
android:visibility=
"gone"
/>
<LinearLayout
android:visibility=
"gone"
android:id=
"@+id/switch_view"
android:layout_width=
"match_parent"
android:layout_height=
"36dp"
...
...
@@ -151,6 +155,7 @@
android:orientation=
"horizontal"
>
<TextView
android:visibility=
"gone"
android:id=
"@+id/no_pay"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -164,10 +169,10 @@
android:textSize=
"14sp"
/>
<TextView
android:visibility=
"gone"
android:id=
"@+id/wechat_pay"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"15dp"
android:background=
"@drawable/grey_commom"
android:gravity=
"center"
android:paddingLeft=
"15dp"
...
...
@@ -177,6 +182,7 @@
android:textSize=
"14sp"
/>
<TextView
android:visibility=
"gone"
android:id=
"@+id/public_pay"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
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