diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index e11181c..293406e 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -114,6 +114,8 @@ suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, + @Query("orderBy") orderBy: String, + @Query("sort") sort: String, @Query("offset") offset: Int, @Query("limit") limit: Int ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index e11181c..293406e 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -114,6 +114,8 @@ suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, + @Query("orderBy") orderBy: String, + @Query("sort") sort: String, @Query("offset") offset: Int, @Query("limit") limit: Int ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 9e12431..78f595b 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -114,7 +114,9 @@ */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { return api.obtainAlarmListByPage( - AuthenticationHelper.token!!, keywords, page, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token!!, + keywords, "alarmTime", "desc", page, + LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index e11181c..293406e 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -114,6 +114,8 @@ suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, + @Query("orderBy") orderBy: String, + @Query("sort") sort: String, @Query("offset") offset: Int, @Query("limit") limit: Int ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 9e12431..78f595b 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -114,7 +114,9 @@ */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { return api.obtainAlarmListByPage( - AuthenticationHelper.token!!, keywords, page, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token!!, + keywords, "alarmTime", "desc", page, + LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index a772c94..5d48ff9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -182,7 +182,6 @@ val v = infoWindow!! //反射得到popup里面的控件对象 val workerNameView = v.findViewById(R.id.workerNameView) - val workerIdView = v.findViewById(R.id.workerIdView) val heartRateView = v.findViewById(R.id.heartRateView) val bloodOxygenView = v.findViewById(R.id.bloodOxygenView) val timeView = v.findViewById(R.id.timeView) @@ -190,8 +189,12 @@ val workerId = marker?.options?.title workers.forEach { if (it.workerId == workerId) { - workerNameView.text = "名称：${it.workerName}" - workerIdView.text = "ID：${it.workerId}" + val workerName = if (it.workerName.isNullOrBlank()) { + "张三" + } else { + it.workerName + } + workerNameView.text = "名称：$workerName" heartRateView.text = "心率：${it.heartRate}次/min" bloodOxygenView.text = "血氧浓度：${it.bloodOxygen}%" timeView.text = "时间：${it.time}" diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index e11181c..293406e 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -114,6 +114,8 @@ suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, + @Query("orderBy") orderBy: String, + @Query("sort") sort: String, @Query("offset") offset: Int, @Query("limit") limit: Int ): String diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 9e12431..78f595b 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -114,7 +114,9 @@ */ suspend fun obtainAlarmListByPage(keywords: String, page: Int): String { return api.obtainAlarmListByPage( - AuthenticationHelper.token!!, keywords, page, LocaleConstant.PAGE_LIMIT + AuthenticationHelper.token!!, + keywords, "alarmTime", "desc", page, + LocaleConstant.PAGE_LIMIT ) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index a772c94..5d48ff9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -182,7 +182,6 @@ val v = infoWindow!! //反射得到popup里面的控件对象 val workerNameView = v.findViewById(R.id.workerNameView) - val workerIdView = v.findViewById(R.id.workerIdView) val heartRateView = v.findViewById(R.id.heartRateView) val bloodOxygenView = v.findViewById(R.id.bloodOxygenView) val timeView = v.findViewById(R.id.timeView) @@ -190,8 +189,12 @@ val workerId = marker?.options?.title workers.forEach { if (it.workerId == workerId) { - workerNameView.text = "名称：${it.workerName}" - workerIdView.text = "ID：${it.workerId}" + val workerName = if (it.workerName.isNullOrBlank()) { + "张三" + } else { + it.workerName + } + workerNameView.text = "名称：$workerName" heartRateView.text = "心率：${it.heartRate}次/min" bloodOxygenView.text = "血氧浓度：${it.bloodOxygen}%" timeView.text = "时间：${it.time}" diff --git a/app/src/main/res/layout/popu_worker_info.xml b/app/src/main/res/layout/popu_worker_info.xml index bf898b9..af43207 100644 --- a/app/src/main/res/layout/popu_worker_info.xml +++ b/app/src/main/res/layout/popu_worker_info.xml @@ -12,11 +12,6 @@ android:text="@string/unknown" /> - -