瀏覽代碼

1.修改主页获取游戏列表接口

王鹏鹏 2 年之前
父節點
當前提交
8eef67927b

+ 1 - 0
.idea/misc.xml

@@ -9,6 +9,7 @@
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/fragment_first.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/layout/activity_login.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_equipment_services.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/tuibeauty/src/main/res/layout/tuibeauty_view_panel.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/tuigift/src/main/res/drawable/tuigift_bg_bottom_dialog.xml" value="0.2265" />

+ 14 - 14
personalcenter/src/main/java/com/yingyang/personalcenter/entity/UserInfoBean.kt

@@ -38,57 +38,57 @@ data class UserInfoBean(
 ) {
     fun getUserNameInfo(): String {
         return if (name.isNullOrEmpty()) {
-            "姓名:"
+            ""
         } else {
-            "姓名:$name"
+            name
         }
     }
 
     fun getBirthDateInfo(): String {
         return if (birthDate.isNullOrEmpty()) {
-            "出生日期:"
+            ""
         } else {
-            "出生日期:$birthDate"
+            birthDate
         }
     }
 
     fun getStartTime(): String {
         return if (orderStartTime.isNullOrEmpty()) {
-            "开通训练日期:"
+            ""
         } else {
-            "开通训练日期:$orderStartTime"
+            orderStartTime
         }
     }
 
     fun getEndTime(): String {
         return if (orderEndTime.isNullOrEmpty()) {
-            "订单截止日期:"
+            ""
         } else {
-            "订单截止日期:$orderEndTime"
+            orderEndTime
         }
     }
 
     fun getDoctorNameInfo(): String {
         return if (doctorName.isNullOrEmpty()) {
-            "医生:"
+            ""
         } else {
-            "医生:$doctorName"
+            doctorName
         }
     }
 
     fun getHospitalDepartmentInfo(): String {
         return if (hospitalDepartment.isNullOrEmpty()) {
-            "院内科室:"
+            ""
         } else {
-            "院内科室:$hospitalDepartment"
+            hospitalDepartment
         }
     }
 
     fun getOrgNameInfo(): String {
         return if (orgName.isNullOrEmpty()) {
-            "就诊医院:"
+            ""
         } else {
-            "就诊医院:$orgName"
+            orgName
         }
     }
 }

+ 21 - 14
personalcenter/src/main/res/layout/activity_personal_center.xml

@@ -77,57 +77,63 @@
                 style="@style/text_personal_center"
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_57px"
-                android:text="@{data.getUserNameInfo()}"
+                android:text='@{"姓名:"+data.getUserNameInfo()}'
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/tvBirthday"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvBirthday"
                 style="@style/text_personal_center"
-                android:text="@{data.getBirthDateInfo()}"
+                android:text='@{"出生日期:"+data.getBirthDateInfo()}'
                 app:layout_constraintBaseline_toBaselineOf="@+id/tvName"
                 app:layout_constraintLeft_toRightOf="@id/tvName"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvOpeningTrainingDate"
                 style="@style/text_personal_center"
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_28px"
-                android:text="@{data.getStartTime()}"
+                android:text='@{"开通训练日期:"+data.getStartTime()}'
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/tvOrderDeadline"
-                app:layout_constraintTop_toBottomOf="@+id/tvName" />
+                app:layout_constraintTop_toBottomOf="@+id/tvName"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvOrderDeadline"
                 style="@style/text_personal_center"
-                android:text="@{data.getEndTime()}"
+                android:text='@{"订单截止日期:"+data.getEndTime()}'
                 app:layout_constraintBaseline_toBaselineOf="@+id/tvOpeningTrainingDate"
                 app:layout_constraintLeft_toRightOf="@id/tvOpeningTrainingDate"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvBirthday" />
+                app:layout_constraintTop_toBottomOf="@+id/tvBirthday"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvDoctor"
                 style="@style/text_personal_center"
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_25px"
-                android:text="@{data.getDoctorNameInfo()}"
+                android:text='@{"医生:"+data.getDoctorNameInfo()}'
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/tvMedicineDepartment"
-                app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate" />
+                app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvMedicineDepartment"
                 style="@style/text_personal_center"
-                android:text="@{data.getHospitalDepartmentInfo()}"
+                android:text='@{"院内科室:"+data.getHospitalDepartmentInfo()}'
                 app:layout_constraintBaseline_toBaselineOf="@+id/tvDoctor"
                 app:layout_constraintLeft_toRightOf="@id/tvDoctor"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate" />
+                app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvHospital"
@@ -135,12 +141,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_25px"
-                android:text="@{data.getOrgNameInfo()}"
+                android:text='@{"就诊医院:"+data.getOrgNameInfo()}'
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/divider_24px"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvDoctor" />
+                app:layout_constraintTop_toBottomOf="@+id/tvDoctor"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/tvDiagnosis"