Jelajahi Sumber

1.添加推荐医生列表接口

王鹏鹏 2 tahun lalu
induk
melakukan
f467862bf6

+ 2 - 1
.idea/misc.xml

@@ -34,13 +34,14 @@
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/common_activity_qr_code_scan.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/common_content_loading_dialog.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/ugckit_fragment_dialog_permission_introduction.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_consult.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_continue_consultation.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_doctor_status.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_content.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_search.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_title.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_recommended_doctor.xml" value="0.155" />
-        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_doctor_details.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_doctor_details.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_health_consultation.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/item_consultation.xml" value="0.3953084274543875" />

+ 5 - 0
baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -130,4 +130,9 @@ object RouterUrlCommon {
      */
     const val healthConsultation = "/health/consultation"
 
+    /**
+     * 医生详情
+     */
+    const val doctorDetails = "/doctor/details"
+
 }

+ 6 - 1
healthconsultation/src/main/AndroidManifest.xml

@@ -8,6 +8,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
-    </application>
 
+        <activity
+            android:name="com.yingyang.healthconsultation.doctordetails.DoctorDetailsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
+    </application>
 </manifest>

+ 2 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -14,6 +14,7 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
 
 /**
  * 健康咨询
@@ -42,7 +43,7 @@ class HealthConsultationActivity :
             rvRecommended.adapter = recommendDoctorAdapter
             recommendDoctorAdapter.setData(doctorBeans)
             recommendDoctorAdapter.onClickListener = {
-
+                JumpUtil.jumpActivity(RouterUrlCommon.doctorDetails, mContext)
             }
         }
     }

+ 3 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/doctordetails/DoctorDetailsActivity.kt

@@ -1,11 +1,14 @@
 package com.yingyang.healthconsultation.doctordetails
 
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.healthconsultation.databinding.ActivityDoctorDetailsBinding
 import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
 
 /**
  * 医生详情
  */
+@Route(path = RouterUrlCommon.doctorDetails)
 class DoctorDetailsActivity : BaseActivity<ActivityDoctorDetailsBinding>() {
 
     override fun initViews() {

+ 6 - 1
healthconsultation/src/main/manifest/AndroidManifest.xml

@@ -7,6 +7,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
-    </application>
 
+        <activity
+            android:name="com.yingyang.healthconsultation.doctordetails.DoctorDetailsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
+    </application>
 </manifest>

+ 18 - 0
healthconsultation/src/main/res/drawable/bg_consult.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/divider_28px" />
+            <gradient
+                android:angle="180"
+                android:endColor="@color/color_FF82A8FF"
+                android:startColor="@color/color_FFB2C3FF"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

+ 225 - 0
healthconsultation/src/main/res/layout/activity_doctor_details.xml

@@ -1,13 +1,238 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyang.healthconsultation.entity.ConsultationBean" />
+    </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@mipmap/icon_uniform_background">
 
+        <LinearLayout
+            android:id="@+id/backLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
+                android:background="@mipmap/icon_back" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:text="@string/doctor_details"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_38px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_12px"
+            android:layout_marginTop="@dimen/divider_33px"
+            android:layout_marginEnd="@dimen/divider_32px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_28px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/imageHead"
+                    android:layout_width="@dimen/divider_100px"
+                    android:layout_height="@dimen/divider_100px"
+                    android:layout_marginStart="@dimen/divider_47px"
+                    android:layout_marginTop="@dimen/divider_59px"
+                    app:isCircle="@{true}"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:loadHeadImg="@{data.avatar}" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvStatus"
+                    android:layout_width="@dimen/divider_114px"
+                    android:layout_height="@dimen/divider_36px"
+                    android:layout_marginStart="@dimen/divider_40px"
+                    android:layout_marginTop="@dimen/divider_141px"
+                    android:background="@drawable/bg_doctor_status"
+                    android:gravity="center"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_24px"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_35px"
+                    android:layout_marginTop="@dimen/divider_40px"
+                    android:text="@{data.userName}"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/imageHead"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@string/app_name" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvDuties"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_40px"
+                    android:layout_marginTop="@dimen/divider_44px"
+                    android:text='@{data.title+":"+data.departmentName}'
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    app:layout_constraintStart_toEndOf="@+id/tvName"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@string/app_name" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvGoodAt"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_35px"
+                    android:layout_marginTop="@dimen/divider_19px"
+                    android:text="@{data.speciality}"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/imageHead"
+                    app:layout_constraintTop_toBottomOf="@+id/tvDuties"
+                    tools:text="@string/app_name" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvConsult"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_35px"
+                    android:layout_marginTop="@dimen/divider_17px"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    app:layout_constraintStart_toEndOf="@+id/imageHead"
+                    app:layout_constraintTop_toBottomOf="@+id/tvGoodAt"
+                    tools:text="@string/app_name" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvGoodRate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_23px"
+                    android:layout_marginEnd="@dimen/divider_26px"
+                    android:text='@{"好评率"+data.goodRate}'
+                    android:textColor="@color/color_FFFF9E05"
+                    android:textSize="@dimen/divider_24px"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvGoodAt"
+                    tools:text="@string/app_name" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_207px"
+                    android:layout_marginStart="@dimen/divider_47px"
+                    android:layout_marginTop="@dimen/divider_55px"
+                    android:layout_marginEnd="@dimen/divider_25px"
+                    android:background="@drawable/bg_consult"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvConsult">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvConsultingService"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_44px"
+                        android:layout_marginTop="@dimen/divider_22px"
+                        android:text="@string/consulting_service"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/imageGraphic"
+                        android:layout_width="@dimen/divider_89px"
+                        android:layout_height="@dimen/divider_89px"
+                        android:layout_marginStart="@dimen/divider_66px"
+                        android:layout_marginTop="@dimen/divider_20px"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvConsultingService" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvGraphicConsultation"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_23px"
+                        android:layout_marginTop="@dimen/divider_28px"
+                        android:text="@string/graphic_consultation"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        app:layout_constraintStart_toEndOf="@+id/imageGraphic"
+                        app:layout_constraintTop_toBottomOf="@+id/tvConsultingService" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvPrice"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_23px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text='@{data.price+"/次"}'
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        app:layout_constraintStart_toEndOf="@+id/imageGraphic"
+                        app:layout_constraintTop_toBottomOf="@+id/tvGraphicConsultation"
+                        tools:text="@string/app_name" />
+
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:layout_width="@dimen/divider_160px"
+                        android:layout_height="@dimen/divider_48px"
+                        android:layout_marginTop="@dimen/divider_120px"
+                        android:layout_marginEnd="@dimen/divider_29px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.card.MaterialCardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

TEMPAT SAMPAH
healthconsultation/src/main/res/mipmap-xxhdpi/icon_back.png


+ 3 - 0
healthconsultation/src/main/res/values/colors.xml

@@ -9,4 +9,7 @@
     <color name="color_FFB4B4B4" tools:ignore="ResourceName">#FFB4B4B4</color>
     <color name="color_FFFFC86D" tools:ignore="ResourceName">#FFFFC86D</color>
     <color name="color_FFFF8B41" tools:ignore="ResourceName">#FFFF8B41</color>
+    <color name="color_FFFF9E05" tools:ignore="ResourceName">#FFFF9E05</color>
+    <color name="color_FFB2C3FF" tools:ignore="ResourceName">#FFB2C3FF</color>
+    <color name="color_FF82A8FF" tools:ignore="ResourceName">#FF82A8FF</color>
 </resources>

+ 2 - 0
healthconsultation/src/main/res/values/dimens.xml

@@ -74,6 +74,7 @@
     <dimen name="divider_160px" tools:ignore="ResourceName">160px</dimen>
     <dimen name="divider_158px" tools:ignore="ResourceName">158px</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>
     <dimen name="divider_135px" tools:ignore="ResourceName">135px</dimen>
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>
@@ -101,6 +102,7 @@
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
     <dimen name="divider_95px" tools:ignore="ResourceName">95px</dimen>
+    <dimen name="divider_89px" tools:ignore="ResourceName">89px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
     <dimen name="divider_87px" tools:ignore="ResourceName">87px</dimen>
     <dimen name="divider_83px" tools:ignore="ResourceName">83px</dimen>

+ 3 - 0
healthconsultation/src/main/res/values/strings.xml

@@ -7,4 +7,7 @@
     <string name="continue_consultation" tools:ignore="ResourceName">继续问诊</string>
     <string name="online_consultation" tools:ignore="ResourceName">在线咨询</string>
     <string name="graphic_consultation" tools:ignore="ResourceName">图文咨询</string>
+    <string name="back_pager" tools:ignore="MissingTranslation,ResourceName">返回</string>
+    <string name="doctor_details" tools:ignore="ResourceName">医生详情</string>
+    <string name="consulting_service" tools:ignore="ResourceName">咨询服务</string>
 </resources>