Skip to content

android / dayu

Go to a project
Commit 1d9acec7 by mReturn
Options

对公支付

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