Skip to content

android / dayu

Go to a project
Commit 106937d5 by mReturn
Options

工单提交验收页代商家收款功能改版

parent 40374a06
Inline Side-by-side
Showing with 55 additions and 28 deletions
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
...@@ -80,6 +80,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -80,6 +80,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private LinearLayout llPaywayNotice; private LinearLayout llPaywayNotice;
private ImageView mScan; private ImageView mScan;
private TextView mTvScan; private TextView mTvScan;
private TextView mTvPayTitle;
private LinearLayout llPayWay;
private RelativeLayout mRlPay; private RelativeLayout mRlPay;
private boolean mWechatStatus; private boolean mWechatStatus;
...@@ -128,6 +130,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -128,6 +130,8 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mTvScan = view.findViewById(R.id.tv_scan_pay); mTvScan = view.findViewById(R.id.tv_scan_pay);
llScanPay = view.findViewById(R.id.ll_scan_pay); llScanPay = view.findViewById(R.id.ll_scan_pay);
llPaywayNotice = view.findViewById(R.id.ll_payway_notice); 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 -> { mNoPay.setOnClickListener(v -> {
if (isSpmOrder) { if (isSpmOrder) {
...@@ -442,41 +446,58 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -442,41 +446,58 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
isShowSignature = true; 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 @Override
public void setPayType(int type) { public void setPayType(int type) {
mPayType = type; mPayType = type;
switch (type){ if (type == 1){
case 1: llPayWay.setVisibility(View.VISIBLE);
setPayWayBackGround(mWechatPay); mWechatPay.setVisibility(View.VISIBLE);
mRlPay.setVisibility(View.VISIBLE); setPayWayBackGround(mWechatPay);
// if (Double.parseDouble(getTotalMoney()) > 0){ mRlPay.setVisibility(View.VISIBLE);
llScanPay.setVisibility(View.VISIBLE); llScanPay.setVisibility(View.VISIBLE);
llPaywayNotice.setVisibility(View.VISIBLE); llPaywayNotice.setVisibility(View.VISIBLE);
mScanPay.setVisibility(View.VISIBLE); mScanPay.setVisibility(View.VISIBLE);
// }else { mTvPayTitle.setVisibility(View.VISIBLE);
// llScanPay.setVisibility(View.GONE); }else {
// llPaywayNotice.setVisibility(View.GONE); llPayWay.setVisibility(View.GONE);
// mScanPay.setVisibility(View.GONE); mWechatPay.setVisibility(View.GONE);
// mPresenter.setmCanProcess(true); mRlPay.setVisibility(View.GONE);
// } llScanPay.setVisibility(View.GONE);
break; llPaywayNotice.setVisibility(View.GONE);
case 3: mScanPay.setVisibility(View.GONE);
setPayWayBackGround(mNoPay); mTvPayTitle.setVisibility(View.GONE);
break;
case 4:
setPayWayBackGround(mPublicPay);
mRlPay.setVisibility(View.VISIBLE);
llScanPay.setVisibility(View.GONE);
break;
} }
} }
@Override @Override
public void setOrderSource(int source) { public void setOrderSource(int source) {
//1,5服务站/服务商 4,6小程序/EU //1,5服务站/服务商 4,6小程序/EU
if (source == 1 || source == 5){ if (source == 1 || source == 5) {
isSpmOrder = true; isSpmOrder = true;
}else { } else {
isSpmOrder = false; isSpmOrder = false;
} }
mServerPrice.setEnabled(!isSpmOrder); mServerPrice.setEnabled(!isSpmOrder);
......
orderCenter/src/main/res/layout/item_multi_process_foot.xml
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_palyer_title" android:id="@+id/tv_palyer_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="43dp" android:layout_height="43dp"
...@@ -29,7 +30,8 @@ ...@@ -29,7 +30,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_54" android:layout_height="@dimen/dp_54"
android:background="@color/cl_white" android:background="@color/cl_white"
android:visibility="gone"> android:visibility="gone"
>
<TextView <TextView
android:id="@+id/tv_player" android:id="@+id/tv_player"
...@@ -102,7 +104,8 @@ ...@@ -102,7 +104,8 @@
android:layout_marginTop="@dimen/dp_27" android:layout_marginTop="@dimen/dp_27"
android:background="@color/cl_white" android:background="@color/cl_white"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone"
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -143,6 +146,7 @@ ...@@ -143,6 +146,7 @@
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout
android:visibility="gone"
android:id="@+id/switch_view" android:id="@+id/switch_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="36dp" android:layout_height="36dp"
...@@ -151,6 +155,7 @@ ...@@ -151,6 +155,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:visibility="gone"
android:id="@+id/no_pay" android:id="@+id/no_pay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -164,10 +169,10 @@ ...@@ -164,10 +169,10 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/wechat_pay" android:id="@+id/wechat_pay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:background="@drawable/grey_commom" android:background="@drawable/grey_commom"
android:gravity="center" android:gravity="center"
android:paddingLeft="15dp" android:paddingLeft="15dp"
...@@ -177,6 +182,7 @@ ...@@ -177,6 +182,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/public_pay" android:id="@+id/public_pay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
......
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