中建365-二期开发-bug优化

app/src/main/java/com/zj365/dc/activity/LoginAct.kt

@@ -287,7 +287,7 @@ class LoginAct : BaseVmAct<LoginVm>() {
             loadingView.dismiss()
             EventBus.getDefault().post(LoginOrRegisterEvent())
             if (it.data.isPerfect == 0){
-                dialogBind.setContentNew("恭喜您成为中健三六五大家庭的医院，为了提供更好的信息服务，请完善您的基本信息。")
+                dialogBind.setContentNew("恭喜您成为中健三六五大家庭的一员，为了提供更好的信息服务，请完善您的基本信息。")
                 dialogBind.show()
             }else{
             //    EventBus.getDefault().post(LoginOrRegisterEvent())

app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt

@@ -684,8 +684,12 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
         binding.mCom.mRecycle.adapter = mFamilyAdapter
         mFamilyAdapter.setOnItemClickListener { adapter, view, position ->
             if (position == mFamilyAdapter.data.size - 1) { //第一期暂不做
+                if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
+                    RouteManager.goAct(ARouterUrl.LOGIN_ACT)
+                }else {
+                    RouteManager.goAct(ARouterUrl.FAMILY_HEALTH_ACT)
+                }
 
-                RouteManager.goAct(ARouterUrl.FAMILY_HEALTH_ACT)
             }
         }
 

network/src/main/java/com/xty/network/model/BreathBean.kt

@@ -99,6 +99,8 @@ data class BreathBean(
         // 将数据集合中的时间映射到时间节点上
         for (model in dataList) {
             calendar.timeInMillis = model.time.toLong() * 1000
+            calendar.set(Calendar.SECOND, 0)
+            calendar.set(Calendar.MILLISECOND, 0)
 
 //            val timestamp = model.time.toLong() // 将时间戳字符串转换为长整型
 //            val time = Date.from(Instant.ofEpochSecond(timestamp)) // 使用 Instant 类转换为 Date 对象
@@ -117,7 +119,7 @@ data class BreathBean(
 
             // 查找对应的时间节点并更新值
 
-            val time = model.time.toLong() * 1000
+            val time =calendar.timeInMillis /*model.time.toLong() * 1000*/
             var mIndex = -1
             run breaking@{
                 for (i in 0 until mappedData.size) {

network/src/main/java/com/xty/network/model/DbpBean.kt

@@ -118,6 +118,8 @@ data class DbpBean(
         // 将数据集合中的时间映射到时间节点上
         for (model in dataList) {
             calendar.timeInMillis = model.time.toLong() * 1000
+            calendar.set(Calendar.SECOND, 0)
+            calendar.set(Calendar.MILLISECOND, 0)
 
 //            val timeStr = model.time
 //            val time = dateFormat.parse(timeStr) // 将字符串转换为 Date 类型
@@ -131,7 +133,7 @@ data class DbpBean(
 //            calendar.set(Calendar.MILLISECOND, 0)
 
             // 查找对应的时间节点并更新值
-            val time = model.time.toLong() * 1000
+            val time = calendar.timeInMillis/*model.time.toLong() * 1000*/
             var mIndex = -1
             run breaking@{
                 for (i in 0 until mappedData.size) {

network/src/main/java/com/xty/network/model/TempBean.kt

@@ -120,9 +120,11 @@ data class TempBean(
         for (model in dataList) {
             calendar.timeInMillis = model.time.toLong() * 1000
 
+            calendar.set(Calendar.SECOND, 0)
+            calendar.set(Calendar.MILLISECOND, 0)
 
             // 查找对应的时间节点并更新值
-            val time = model.time.toLong() * 1000
+            val time =calendar.timeInMillis /*model.time.toLong() * 1000*/
             var mIndex = -1
             run breaking@{
                 for (i in 0 until mappedData.size) {

network/src/main/java/com/xty/network/model/XlBean.kt

@@ -90,10 +90,11 @@ data class XlBean(
         // 将数据集合中的时间映射到时间节点上
         for (model in dataList) {
             calendar.timeInMillis = model.time.toLong() * 1000
-
+            calendar.set(Calendar.SECOND, 0)
+            calendar.set(Calendar.MILLISECOND, 0)
 
             // 查找对应的时间节点并更新值
-            val time = model.time.toLong() * 1000
+            val time =calendar.timeInMillis /*model.time.toLong() * 1000*/
             var mIndex = -1
             run breaking@{
                 for (i in 0 until mappedData.size) {

network/src/main/java/com/xty/network/model/XyBean.kt

@@ -98,7 +98,8 @@ data class XyBean(
         // 将数据集合中的时间映射到时间节点上
         for (model in dataList) {
             calendar.timeInMillis = model.time.toLong() * 1000
-
+            calendar.set(Calendar.SECOND, 0)
+            calendar.set(Calendar.MILLISECOND, 0)
 //            val timestamp = model.time.toLong() // 将时间戳字符串转换为长整型
 //            val time = Date.from(Instant.ofEpochSecond(timestamp)) // 使用 Instant 类转换为 Date 对象
 //            calendar.time = time
@@ -116,7 +117,7 @@ data class XyBean(
 
             // 查找对应的时间节点并更新值
 
-            val time = model.time.toLong() * 1000
+            val time =calendar.timeInMillis /*model.time.toLong() * 1000*/
             var mIndex = -1
             run breaking@{
                 for (i in 0 until mappedData.size) {