Explorar o código

1.修改数据监控页面UI

王鹏鹏 %!s(int64=2) %!d(string=hai) anos
pai
achega
9ac0d56768

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

@@ -1,5 +1,7 @@
 package com.yingyang.personalcenter.entity
 
+import com.yingyangfly.baselib.ext.timeFormat
+
 /**
  * 用户信息
  */
@@ -57,7 +59,7 @@ data class UserInfoBean(
         return if (orderStartTime.isNullOrEmpty()) {
             ""
         } else {
-            orderStartTime
+            timeFormat(orderStartTime)
         }
     }
 
@@ -65,7 +67,7 @@ data class UserInfoBean(
         return if (orderEndTime.isNullOrEmpty()) {
             ""
         } else {
-            orderEndTime
+            timeFormat(orderEndTime)
         }
     }
 

+ 7 - 1
personalcenter/src/main/java/com/yingyang/personalcenter/personalcenter/PersonalCenterActivity.kt

@@ -1,5 +1,6 @@
 package com.yingyang.personalcenter.personalcenter
 
+import android.util.Log
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
@@ -61,15 +62,20 @@ class PersonalCenterActivity :
     }
 
     override fun initData() {
+        diagnosisList.clear()
         viewModel.getUserInfo(fail = {
             it.toast()
         }, success = {
             if (it != null) {
                 binding.data = it
                 if (it.diagnoseResult.isNullOrEmpty().not()) {
-                    diagnosisAdapter.setData(it.diagnoseResult)
+                    it.diagnoseResult.forEach {
+                        Log.e("wpp", "-------------------->"+it)
+                    }
+                    diagnosisList.addAll(it.diagnoseResult)
                 }
             }
+            diagnosisAdapter.setData(diagnosisList)
         })
     }
 }

+ 2 - 2
personalcenter/src/main/res/layout/item_diagnosis.xml

@@ -21,8 +21,8 @@
         android:paddingTop="@dimen/divider_7px"
         android:paddingEnd="@dimen/divider_40px"
         android:paddingBottom="@dimen/divider_7px"
-        android:text="阿尔茨海默症"
-        android:textColor="#FF507AFF"
+        android:text="@{data}"
+        android:textColor="@color/color_FF507AFF"
         android:textSize="@dimen/divider_24px" />
 
 </layout>