Skip to content

android / dayu

Go to a project
Commit 1d9acec7 by mReturn
Options

对公支付

parent 56a4b1c2 master … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_web 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 dev20230405
Inline Side-by-side
Showing with 54 additions and 21 deletions
baseSDK/src/main/res/values/strings.xml
......@@ -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
......@@ -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
......@@ -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
......@@ -129,6 +129,16 @@
android:layout_marginTop="@dimen/dp_10" />
</LinearLayout>
<TextView
android:id="@+id/switch_text"
android:layout_width="match_parent"
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"
......@@ -137,15 +147,6 @@
android:orientation="horizontal">
<TextView
android:id="@+id/switch_text"
android:layout_width="wrap_content"
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:textSize="15sp" />
<TextView
android:id="@+id/no_pay"
android:layout_width="wrap_content"
android:layout_height="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
......
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