1.支付页面添加倒计时取消支付功能

.idea/misc.xml

@@ -522,10 +522,13 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_result.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/item_game_result.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/drawable/bg_btn_doctor_details.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_request.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_sheet.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_doctor_details.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_health_consultation.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_paid.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_payment.xml" value="0.4744525547445255" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/dialog_payment_qr_code.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_consultation_record.xml" value="0.23697916666666666" />

healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -76,7 +76,7 @@ class HealthConsultationActivity :
             recommendDoctorAdapter.setData(doctorBeans)
             recommendDoctorAdapter.onClickListener = { bean, type ->
                 if (TextUtils.equals("consult", type)) {
-                    if(consultationBeans.isNotEmpty()){
+                    if (consultationBeans.isNotEmpty()) {
                         "您有正在医疗咨询中，结束问诊后才能购买".toast()
                     } else {
                         JumpUtil.jumpActivityWithUrl(
@@ -102,7 +102,6 @@ class HealthConsultationActivity :
         binding {
             layoutHome.setOnTouchListener(this@HealthConsultationActivity)
             searchLayout.setOnTouchListener(this@HealthConsultationActivity)
-            btnHome.setOnTouchListener(this@HealthConsultationActivity)
             btnConsultationRecord.setOnTouchListener(this@HealthConsultationActivity)
         }
     }
@@ -143,7 +142,7 @@ class HealthConsultationActivity :
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.layoutHome || v.id == R.id.searchLayout || v.id == R.id.btnHome || v.id == R.id.btnConsultationRecord) {
+                if (v.id == R.id.layoutHome || v.id == R.id.searchLayout || v.id == R.id.btnConsultationRecord) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
@@ -157,11 +156,6 @@ class HealthConsultationActivity :
                     R.id.searchLayout -> {
                         JumpUtil.jumpActivity(RouterUrlCommon.searchDoctor, mContext)
                     }
-
-                    R.id.btnHome -> {
-                        //返回首页
-                        finish()
-                    }
                     R.id.btnConsultationRecord -> {
                         JumpUtil.jumpActivity(
                             RouterUrlCommon.consultationRecord,
@@ -171,7 +165,7 @@ class HealthConsultationActivity :
                 }
             }
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.layoutHome || v.id == R.id.searchLayout || v.id == R.id.btnHome || v.id == R.id.btnConsultationRecord) {
+                if (v.id == R.id.layoutHome || v.id == R.id.searchLayout || v.id == R.id.btnConsultationRecord) {
                     v.startAnimation(getEndAnimation())
                 }
             }

healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/MedicalConsultationDetailBean.kt

@@ -16,7 +16,7 @@ data class MedicalConsultationDetailBean(
     val finishTime: String,
     val id: String,
     val images: String,
-    val isConsultation: String,
+    val isConsultation: String,//是否就诊 0是 1否
     val orgCode: String,
     val orgName: String,
     val payMethod: String,
@@ -30,7 +30,17 @@ data class MedicalConsultationDetailBean(
     val sysUserName: String,
     val updateBy: String,
     val updateTime: String
-)
+) {
+    fun seenDoctorInfo(): String {
+        return if (TextUtils.equals("0", isConsultation)) {
+            "是"
+        } else if (TextUtils.equals("", isConsultation)) {
+            "否"
+        } else {
+            ""
+        }
+    }
+}
 
 data class PayOrder(
     val attach: String,
@@ -74,18 +84,18 @@ data class PayOrder(
     }
 
     fun getPayMoneyInfo(): String {
-        return if (TextUtils.isEmpty(pay_money)) {
+        return if (TextUtils.isEmpty(payMoneyYUAN)) {
             ""
         } else {
-            pay_money
+            payMoneyYUAN
         }
     }
 
     fun getCreateTimeInfo(): String {
-        return if (TextUtils.isEmpty(createTime)) {
+        return if (TextUtils.isEmpty(payTime)) {
             ""
         } else {
-            timeFormat(createTime)
+            timeFormat(payTime)
         }
     }
 

healthconsultation/src/main/res/drawable/bg_btn_doctor_details.xml

@@ -2,6 +2,6 @@
 <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" />
+    <corners android:radius="@dimen/divider_12px" />
     <solid android:color="@color/color_FF4A76FF" />
 </shape>

healthconsultation/src/main/res/layout/activity_consultation_request.xml

@@ -236,7 +236,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_36px"
                         android:layout_marginBottom="@dimen/divider_28px"
-                        android:text='@{user.idCard}'
+                        android:text='@{"身份证号："+user.idCard}'
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         app:layout_constraintBottom_toBottomOf="parent"

healthconsultation/src/main/res/layout/activity_health_consultation.xml

@@ -68,22 +68,33 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="@dimen/divider_163px"
                     android:layout_height="@dimen/divider_142px"
-                    android:layout_marginTop="@dimen/divider_51px"
-                    android:layout_marginEnd="@dimen/divider_30px"
+                    android:layout_marginTop="@dimen/divider_64px"
+                    android:layout_marginEnd="@dimen/divider_145px"
                     android:background="@mipmap/icon_marshalling"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/btnConsultationRecord"
+                    android:layout_width="@dimen/divider_112px"
+                    android:layout_height="@dimen/divider_48px"
+                    android:layout_marginTop="@dimen/divider_14px"
+                    android:layout_marginEnd="@dimen/divider_30px"
+                    android:background="@drawable/bg_btn_doctor_details"
+                    android:text="@string/consultation_record"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_28px"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/searchLayout"
-                    android:layout_width="match_parent"
+                    android:layout_width="@dimen/divider_611px"
                     android:layout_height="@dimen/divider_60px"
                     android:layout_marginStart="@dimen/divider_226px"
-                    android:layout_marginEnd="@dimen/divider_226px"
                     android:layout_marginBottom="@dimen/divider_39px"
                     android:background="@drawable/bg_home_page_search"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -164,35 +175,6 @@
                         android:layout_height="wrap_content"
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/divider_22px">
-
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/btnHome"
-                            android:layout_width="@dimen/divider_321px"
-                            android:layout_height="@dimen/divider_78px"
-                            android:layout_marginStart="@dimen/divider_235px"
-                            android:background="@drawable/bg_btn_doctor_details"
-                            android:text="@string/home_pager"
-                            android:textColor="@android:color/white"
-                            android:textSize="@dimen/divider_28px"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/btnConsultationRecord"
-                            android:layout_width="@dimen/divider_321px"
-                            android:layout_height="@dimen/divider_78px"
-                            android:layout_marginStart="@dimen/divider_48px"
-                            android:background="@drawable/bg_btn_doctor_details"
-                            android:text="@string/consultation_record"
-                            android:textColor="@android:color/white"
-                            android:textSize="@dimen/divider_28px"
-                            app:layout_constraintStart_toEndOf="@+id/btnHome"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
         </LinearLayout>

healthconsultation/src/main/res/layout/activity_paid.xml

@@ -252,7 +252,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_38px"
                         android:layout_marginTop="@dimen/divider_16px"
-                        android:text='@{"是否就诊过: "+data.isConsultation}'
+                        android:text='@{"是否就诊过: "+data.seenDoctorInfo()}'
                         android:textColor="@color/color_FF333333"
                         android:textSize="@dimen/divider_24px"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -288,6 +288,7 @@
                         android:id="@+id/rvUploadData"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:minHeight="@dimen/divider_62px"
                         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/tvUploadData"
@@ -342,19 +343,6 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvOrderNumber" />
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/tvPayableAmount"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/divider_38px"
-                            android:layout_marginTop="@dimen/divider_16px"
-                            android:text='@{"应付金额："+payOrder.getPayMoneyInfo()}'
-                            android:textColor="@color/color_FF333333"
-                            android:textSize="@dimen/divider_24px"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tvOrderTime" />
-
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvPaidInAmount"
                             android:layout_width="match_parent"
@@ -366,7 +354,7 @@
                             android:textSize="@dimen/divider_24px"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tvPayableAmount" />
+                            app:layout_constraintTop_toBottomOf="@+id/tvOrderTime" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvPaymentMethod"

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

@@ -9,6 +9,7 @@
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
     <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
+    <dimen name="divider_611px" tools:ignore="ResourceName">611px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
@@ -92,6 +93,7 @@
     <dimen name="divider_160px" tools:ignore="ResourceName">160px</dimen>
     <dimen name="divider_158px" tools:ignore="ResourceName">158px</dimen>
     <dimen name="divider_151px" tools:ignore="ResourceName">151px</dimen>
+    <dimen name="divider_145px" tools:ignore="ResourceName">145px</dimen>
     <dimen name="divider_142px" tools:ignore="ResourceName">142px</dimen>
     <dimen name="divider_141px" tools:ignore="ResourceName">141px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>