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
1d9acec7
authored
Jan 15, 2020
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对公支付
parent
56a4b1c2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
20 deletions
baseSDK/src/main/res/values/strings.xml
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
orderCenter/src/main/res/layout/item_multi_process_foot.xml
baseSDK/src/main/res/values/strings.xml
View file @
1d9acec7
...
...
@@ -779,5 +779,6 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"hour_ago"
>
小时前
</string>
<string
name=
"min_ago"
>
分钟前
</string>
<string
name=
"just_before"
>
刚刚
</string>
<string
name=
"public_pay"
>
对公支付
</string>
</resources>
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
View file @
1d9acec7
...
...
@@ -67,6 +67,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private
boolean
canPay
;
private
TextView
mTotalMoney
;
private
TextView
mCashPay
;
private
TextView
mPublicPay
;
private
TextView
mWechatPay
;
private
TextView
mNoPay
;
private
int
mPayType
=
3
;
...
...
@@ -115,6 +116,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mNoPay
=
view
.
findViewById
(
R
.
id
.
no_pay
);
mWechatPay
=
view
.
findViewById
(
R
.
id
.
wechat_pay
);
mCashPay
=
view
.
findViewById
(
R
.
id
.
cash_pay
);
mPublicPay
=
view
.
findViewById
(
R
.
id
.
public_pay
);
mPhoto
=
view
.
findViewById
(
R
.
id
.
photo
);
mScanPay
=
view
.
findViewById
(
R
.
id
.
scan_pay
);
...
...
@@ -125,6 +127,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mPayType
=
3
;
clearData
();
mRlPay
.
setVisibility
(
View
.
GONE
);
mScanPay
.
setVisibility
(
View
.
GONE
);
setBackGround
(
mNoPay
);
});
mWechatPay
.
setOnClickListener
(
v
->
{
...
...
@@ -134,6 +137,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
if
(
mWechatStatus
)
{
mPayType
=
1
;
mRlPay
.
setVisibility
(
View
.
VISIBLE
);
mScanPay
.
setVisibility
(
View
.
VISIBLE
);
setBackGround
(
mWechatPay
);
}
else
{
ToastUtils
.
showShortToast
(
"您公司未开通移动支付,请到服务商系统-设置-移动支付设置中进行开通。"
);
...
...
@@ -146,10 +150,22 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
}
else
{
mPayType
=
2
;
mRlPay
.
setVisibility
(
View
.
VISIBLE
);
mScanPay
.
setVisibility
(
View
.
GONE
);
setBackGround
(
mCashPay
);
}
});
mPublicPay
.
setOnClickListener
(
v
->
{
if
(
canPay
)
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
can_not_repet_get_money
));
}
else
{
mPayType
=
4
;
mRlPay
.
setVisibility
(
View
.
VISIBLE
);
mScanPay
.
setVisibility
(
View
.
GONE
);
setBackGround
(
mPublicPay
);
}
});
// if (mPresenter.getOrderType() == 1) {
// initPhotoView();
// mRepairType.setOnClickListener(v -> showPayerDialog());
...
...
@@ -177,9 +193,11 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mNoPay
.
setBackgroundResource
(
R
.
drawable
.
grey_commom
);
mCashPay
.
setBackgroundResource
(
R
.
drawable
.
grey_commom
);
mWechatPay
.
setBackgroundResource
(
R
.
drawable
.
grey_commom
);
mPublicPay
.
setBackgroundResource
(
R
.
drawable
.
grey_commom
);
mNoPay
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_tab_init
));
mCashPay
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_tab_init
));
mWechatPay
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_tab_init
));
mPublicPay
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_tab_init
));
tv
.
setBackgroundResource
(
R
.
drawable
.
blue_commom
);
tv
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
}
...
...
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
View file @
1d9acec7
...
...
@@ -150,6 +150,7 @@
android:orientation=
"horizontal"
>
<LinearLayout
android:visibility=
"gone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -192,6 +193,20 @@
</LinearLayout>
<TextView
android:id=
"@+id/tv_order_detail"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
android:layout_marginRight=
"40dp"
android:layout_marginTop=
"5dp"
android:ellipsize=
"end"
android:maxLines=
"1"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/size_login_hint_text"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_server_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -203,18 +218,6 @@
</LinearLayout>
<TextView
android:id=
"@+id/tv_order_detail"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
android:layout_marginRight=
"40dp"
android:layout_marginTop=
"5dp"
android:ellipsize=
"end"
android:maxLines=
"1"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/size_login_hint_text"
android:textStyle=
"bold"
/>
<LinearLayout
android:layout_width=
"match_parent"
...
...
orderCenter/src/main/res/layout/item_multi_process_foot.xml
View file @
1d9acec7
...
...
@@ -129,22 +129,23 @@
android:layout_marginTop=
"@dimen/dp_10"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/switch_view"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_54"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/switch_text"
android:layout_width=
"wrap_cont
ent"
android:layout_width=
"match_par
ent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_13"
android:text=
"@string/tv_about_user_feiyong"
android:textColor=
"@color/cl_home_title_text_color"
android:layout_marginTop=
"10dp"
android:textSize=
"15sp"
/>
<LinearLayout
android:id=
"@+id/switch_view"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_54"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/no_pay"
android:layout_width=
"wrap_content"
...
...
@@ -177,6 +178,16 @@
android:text=
"@string/cash_pay"
android:textColor=
"@color/cl_tab_init"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/public_pay"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"15dp"
android:background=
"@drawable/grey_commom"
android:padding=
"8dp"
android:text=
"@string/public_pay"
android:textColor=
"@color/cl_tab_init"
android:textSize=
"14sp"
/>
</LinearLayout>
<ImageView
...
...
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