1.优化UI

.idea/misc.xml

@@ -67,6 +67,7 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_selected.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services_alipay.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services_wechatpay.xml" value="0.16" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_status.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_status_to_be_paid.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_timing.xml" value="0.155" />

healthconsultation/src/main/java/com/yingyang/healthconsultation/dialog/PaymentQrCodeDialog.kt

@@ -1,11 +1,13 @@
 package com.yingyang.healthconsultation.dialog
 
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
 import androidx.fragment.app.DialogFragment
 import com.bumptech.glide.Glide
 import com.google.zxing.common.BitmapUtils
@@ -25,15 +27,18 @@ class PaymentQrCodeDialog : DialogFragment() {
 
     private var orderNo = ""
     private var qrCode = ""
+    private var method = ""
 
+    private var purchaseServicesBtn: AppCompatTextView? = null
     private var payImage: AppCompatImageView? = null
     private var paySuccessBtn: AppCompatButton? = null
     private var imageClose: AppCompatImageView? = null
     var onQueryPaymentStatusListener: ((orderNo: String) -> Unit)? = null
 
-    fun setPaymentQrCodeBean(orderNo: String, qrCode: String) {
+    fun setPaymentQrCodeBean(orderNo: String, qrCode: String, method: String) {
         this.orderNo = orderNo
         this.qrCode = qrCode
+        this.method = method
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -70,9 +75,15 @@ class PaymentQrCodeDialog : DialogFragment() {
     }
 
     private fun findId(rootView: View) {
+        purchaseServicesBtn = rootView.findViewById(R.id.purchaseServicesBtn)
         payImage = rootView.findViewById(R.id.payImage)
         paySuccessBtn = rootView.findViewById(R.id.paySuccessBtn)
         imageClose = rootView.findViewById(R.id.imageClose)
+        if (TextUtils.equals("1", method)) {
+            purchaseServicesBtn?.setBackgroundResource(R.drawable.bg_payment_services_wechatpay)
+        } else {
+            purchaseServicesBtn?.setBackgroundResource(R.drawable.bg_payment_services_alipay)
+        }
         imageClose!!.setOnSingleClickListener {
             if (orderNo.isEmpty()) {
                 dismiss()

healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentActivity.kt

@@ -33,6 +33,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
     private var id: String = ""
     private var doctorBean: DoctorBean? = null
     private var orderNo = ""
+    private var method = ""
     private var paymentQrCodeDialog: PaymentQrCodeDialog? = null
     private var purchaseConsultationBean: PurchaseConsultationBean? = null
 
@@ -85,6 +86,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                         if (purchaseConsultationBean != null) {
                             purchaseConsultationBean?.payMethod = "1"
                         }
+                        method = "1"
                         binding {
                             wechatLayout.setBackgroundResource(R.drawable.bg_payment_selected)
                             alipayLayout.setBackgroundResource(R.drawable.bg_payment_unselected)
@@ -96,6 +98,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                         if (purchaseConsultationBean != null) {
                             purchaseConsultationBean?.payMethod = "2"
                         }
+                        method = "2"
                         binding {
                             wechatLayout.setBackgroundResource(R.drawable.bg_payment_unselected)
                             alipayLayout.setBackgroundResource(R.drawable.bg_payment_selected)
@@ -138,7 +141,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                             RxBus.get().send(RxBusCodes.SuccessfulPurchase)
                             finish()
                         }
-                        paymentQrCodeDialog?.setPaymentQrCodeBean(it.orderNo, it.qrCode)
+                        paymentQrCodeDialog?.setPaymentQrCodeBean(it.orderNo, it.qrCode, method)
                         paymentQrCodeDialog?.show(supportFragmentManager, "paymentQrCodeDialog")
                     }
                 })

healthconsultation/src/main/res/drawable/bg_payment_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>

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

@@ -35,4 +35,5 @@
     <color name="color_FF222222" tools:ignore="ResourceName">#FF222222</color>
     <color name="color_FFD2D0C9" tools:ignore="ResourceName">#FFD2D0C9</color>
     <color name="color_FFFFA81A" tools:ignore="ResourceName">#FFFFA81A</color>
+    <color name="color_15BA11" tools:ignore="ResourceName">#15BA11</color>
 </resources>