1.修改支付状态UI

workbenches/src/main/java/com/yingyang/workbenches/dialog/PurchaseServicesDialog.kt

@@ -1,8 +1,12 @@
 package com.yingyang.workbenches.dialog
 
 import android.annotation.SuppressLint
+import android.graphics.Color
 import android.os.Bundle
-import android.text.Html
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.TextUtils
+import android.text.style.ForegroundColorSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -41,6 +45,7 @@ class PurchaseServicesDialog : DialogFragment() {
     private var alipayLayout: ConstraintLayout? = null
     private var payImage: AppCompatImageView? = null
     private var paySuccessBtn: Button? = null
+    private var purchaseServicesBtn: Button? = null
 
     fun setPackageBean(packageId: String, payMoney: String, packageName: String) {
         this.packageId = packageId
@@ -87,8 +92,14 @@ class PurchaseServicesDialog : DialogFragment() {
         paySuccessBtn = rootView.findViewById(R.id.paySuccessBtn)
         payImage?.show(false)
         paySuccessBtn?.show(false)
-        tvPackageMoney?.text =
-            Html.fromHtml("您购买的是<font color='#FFFF2B2B'>$packageName</font>")
+        purchaseServicesBtn = rootView.findViewById(R.id.purchaseServicesBtn)
+
+        val spannableString = SpannableString("您购买的是$packageName")
+        spannableString.setSpan(
+            ForegroundColorSpan(Color.parseColor("#FFFF2B2B")),
+            5, spannableString.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        tvPackageMoney?.text = spannableString
         //微信支付
         weChatLayout?.setOnSingleClickListener {
             RxBus.get().send(GetPayImageEvent(packageId, "1", payMoney, packageName))
@@ -123,6 +134,13 @@ class PurchaseServicesDialog : DialogFragment() {
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun getPayImage(event: GetQrCodeEvent) {
         orderNo = event.orderNo
+        if (TextUtils.equals("1", event.payMethod)) {
+            purchaseServicesBtn?.setBackgroundResource(R.drawable.bg_purchase_services_wechatpay)
+            paySuccessBtn?.setBackgroundResource(R.drawable.bg_purchase_services_wechatpay_btn)
+        } else {
+            purchaseServicesBtn?.setBackgroundResource(R.drawable.bg_purchase_services_alipay)
+            paySuccessBtn?.setBackgroundResource(R.drawable.bg_work_benches_btn)
+        }
         val bitmap = BitmapUtils.create2DCode(event.qrCode)
         if (bitmap != null) {
             tvPackageMoney?.show(false)

workbenches/src/main/java/com/yingyang/workbenches/entity/GetQrCodeEvent.java

@@ -8,10 +8,12 @@ public class GetQrCodeEvent {
 
     private String orderNo;
     private String qrCode;
+    private String payMethod;
 
-    public GetQrCodeEvent(String orderNo, String qrCode) {
+    public GetQrCodeEvent(String orderNo, String qrCode, String payMethod) {
         this.orderNo = orderNo;
         this.qrCode = qrCode;
+        this.payMethod = payMethod;
     }
 
     public String getOrderNo() {
@@ -21,4 +23,8 @@ public class GetQrCodeEvent {
     public String getQrCode() {
         return qrCode;
     }
+
+    public String getPayMethod() {
+        return payMethod;
+    }
 }

workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -80,7 +80,7 @@ class ServicePackageActivity :
             it.toast()
         }, success = {
             if (it != null) {
-                RxBus.get().send(GetQrCodeEvent(it.orderNo, it.qrCode))
+                RxBus.get().send(GetQrCodeEvent(it.orderNo, it.qrCode, bean.payMethod))
             }
         })
     }

workbenches/src/main/res/drawable/bg_purchase_services_wechatpay.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:topLeftRadius="@dimen/divider_42px"
+        android:topRightRadius="@dimen/divider_42px" />
+    <solid android:color="@color/color_15BA11" />
+</shape>

workbenches/src/main/res/drawable/bg_purchase_services_wechatpay_btn.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_20px" />
+    <solid android:color="@color/color_15BA11" />
+</shape>

workbenches/src/main/res/layout/dialog_purchase_services.xml

@@ -31,7 +31,7 @@
                 android:id="@+id/purchaseServicesBtn"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_120px"
-                android:background="@drawable/bg_purchase_services_button"
+                android:background="@drawable/bg_purchase_services_alipay"
                 android:text="@string/order_payment"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_34px"

workbenches/src/main/res/layout/item_service_package_type.xml

@@ -20,8 +20,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:paddingStart="@dimen/divider_10px"
-            android:paddingEnd="@dimen/divider_10px"
+            android:paddingStart="@dimen/divider_31px"
+            android:paddingEnd="@dimen/divider_31px"
             android:text="@{data.dictLabel}"
             android:textSize="@dimen/divider_24px" />
     </LinearLayout>

workbenches/src/main/res/values/colors.xml

@@ -49,4 +49,5 @@
     <color name="color_FF93C5D8" tools:ignore="ResourceName">#FF93C5D8</color>
     <color name="color_FF979797" tools:ignore="ResourceName">#FF979797</color>
     <color name="color_FF9FA5B4" tools:ignore="ResourceName">#FF9FA5B4</color>
+    <color name="color_15BA11" tools:ignore="ResourceName">#15BA11</color>
 </resources>