diff --git a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt index 82b52a1..eade48d 100644 --- a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt @@ -29,12 +29,12 @@ holder.dateView.text = rowsBean.createTime holder.titleView.text = rowsBean.messageTitle holder.contentView.text = rowsBean.messageContent -// val state = if (rowsBean.isRead == "0") { -// View.VISIBLE -// } else { -// View.INVISIBLE -// } -// holder.readStateView.visibility = state + val state = if (rowsBean.messageStatus == "0") { + View.VISIBLE + } else { + View.INVISIBLE + } + holder.readStateView.visibility = state //绑定事件 holder.deleteView.setOnClickListener { listener?.onDeleteClicked(position) diff --git a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt index 82b52a1..eade48d 100644 --- a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt @@ -29,12 +29,12 @@ holder.dateView.text = rowsBean.createTime holder.titleView.text = rowsBean.messageTitle holder.contentView.text = rowsBean.messageContent -// val state = if (rowsBean.isRead == "0") { -// View.VISIBLE -// } else { -// View.INVISIBLE -// } -// holder.readStateView.visibility = state + val state = if (rowsBean.messageStatus == "0") { + View.VISIBLE + } else { + View.INVISIBLE + } + holder.readStateView.visibility = state //绑定事件 holder.deleteView.setOnClickListener { listener?.onDeleteClicked(position) diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt index fdc4896..20c44ae 100644 --- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt @@ -120,14 +120,12 @@ override fun onShowMoreClicked(position: Int) { // deviceViewModel.obtainDeviceDetail(dataBeans[position].deviceCode) -// //更改数据库里通知状态 -// DataBaseManager.instance.updateLocaleMessageById( -// userId, dataBeans[position].messageId -// ) -// messageAdapter.notifyItemChanged(position) -// messageAdapter.notifyItemRangeChanged( -// position, dataBeans.size - position -// ) + //更改数据库里通知状态 + messageViewModel.updateMessageById(dataBeans[position].id, "1") + messageAdapter.notifyItemChanged(position) + messageAdapter.notifyItemRangeChanged( + position, dataBeans.size - position + ) } }) } diff --git a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt index 82b52a1..eade48d 100644 --- a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt @@ -29,12 +29,12 @@ holder.dateView.text = rowsBean.createTime holder.titleView.text = rowsBean.messageTitle holder.contentView.text = rowsBean.messageContent -// val state = if (rowsBean.isRead == "0") { -// View.VISIBLE -// } else { -// View.INVISIBLE -// } -// holder.readStateView.visibility = state + val state = if (rowsBean.messageStatus == "0") { + View.VISIBLE + } else { + View.INVISIBLE + } + holder.readStateView.visibility = state //绑定事件 holder.deleteView.setOnClickListener { listener?.onDeleteClicked(position) diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt index fdc4896..20c44ae 100644 --- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt @@ -120,14 +120,12 @@ override fun onShowMoreClicked(position: Int) { // deviceViewModel.obtainDeviceDetail(dataBeans[position].deviceCode) -// //更改数据库里通知状态 -// DataBaseManager.instance.updateLocaleMessageById( -// userId, dataBeans[position].messageId -// ) -// messageAdapter.notifyItemChanged(position) -// messageAdapter.notifyItemRangeChanged( -// position, dataBeans.size - position -// ) + //更改数据库里通知状态 + messageViewModel.updateMessageById(dataBeans[position].id, "1") + messageAdapter.notifyItemChanged(position) + messageAdapter.notifyItemRangeChanged( + position, dataBeans.size - position + ) } }) } diff --git a/app/src/main/java/com/casic/br/model/PushMessageModel.java b/app/src/main/java/com/casic/br/model/PushMessageModel.java index f6aed42..8741687 100644 --- a/app/src/main/java/com/casic/br/model/PushMessageModel.java +++ b/app/src/main/java/com/casic/br/model/PushMessageModel.java @@ -67,6 +67,7 @@ private String ids; private String messageCode; private String messageContent; + private String messageStatus; private String messageTitle; private String provinceList; private String targetUsers; @@ -113,6 +114,14 @@ this.messageContent = messageContent; } + public String getMessageStatus() { + return messageStatus; + } + + public void setMessageStatus(String messageStatus) { + this.messageStatus = messageStatus; + } + public String getMessageTitle() { return messageTitle; } diff --git a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt index 82b52a1..eade48d 100644 --- a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt @@ -29,12 +29,12 @@ holder.dateView.text = rowsBean.createTime holder.titleView.text = rowsBean.messageTitle holder.contentView.text = rowsBean.messageContent -// val state = if (rowsBean.isRead == "0") { -// View.VISIBLE -// } else { -// View.INVISIBLE -// } -// holder.readStateView.visibility = state + val state = if (rowsBean.messageStatus == "0") { + View.VISIBLE + } else { + View.INVISIBLE + } + holder.readStateView.visibility = state //绑定事件 holder.deleteView.setOnClickListener { listener?.onDeleteClicked(position) diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt index fdc4896..20c44ae 100644 --- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt @@ -120,14 +120,12 @@ override fun onShowMoreClicked(position: Int) { // deviceViewModel.obtainDeviceDetail(dataBeans[position].deviceCode) -// //更改数据库里通知状态 -// DataBaseManager.instance.updateLocaleMessageById( -// userId, dataBeans[position].messageId -// ) -// messageAdapter.notifyItemChanged(position) -// messageAdapter.notifyItemRangeChanged( -// position, dataBeans.size - position -// ) + //更改数据库里通知状态 + messageViewModel.updateMessageById(dataBeans[position].id, "1") + messageAdapter.notifyItemChanged(position) + messageAdapter.notifyItemRangeChanged( + position, dataBeans.size - position + ) } }) } diff --git a/app/src/main/java/com/casic/br/model/PushMessageModel.java b/app/src/main/java/com/casic/br/model/PushMessageModel.java index f6aed42..8741687 100644 --- a/app/src/main/java/com/casic/br/model/PushMessageModel.java +++ b/app/src/main/java/com/casic/br/model/PushMessageModel.java @@ -67,6 +67,7 @@ private String ids; private String messageCode; private String messageContent; + private String messageStatus; private String messageTitle; private String provinceList; private String targetUsers; @@ -113,6 +114,14 @@ this.messageContent = messageContent; } + public String getMessageStatus() { + return messageStatus; + } + + public void setMessageStatus(String messageStatus) { + this.messageStatus = messageStatus; + } + public String getMessageTitle() { return messageTitle; } diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 19e036a..8c55803 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -127,11 +127,20 @@ ): String /** - * Banner + * 删除消息 */ @POST("/appPushInfo/delete") suspend fun deleteMessageById( @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 更新消息 + */ + @POST("/appPushInfo/update") + suspend fun updateMessageById( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt index 82b52a1..eade48d 100644 --- a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt @@ -29,12 +29,12 @@ holder.dateView.text = rowsBean.createTime holder.titleView.text = rowsBean.messageTitle holder.contentView.text = rowsBean.messageContent -// val state = if (rowsBean.isRead == "0") { -// View.VISIBLE -// } else { -// View.INVISIBLE -// } -// holder.readStateView.visibility = state + val state = if (rowsBean.messageStatus == "0") { + View.VISIBLE + } else { + View.INVISIBLE + } + holder.readStateView.visibility = state //绑定事件 holder.deleteView.setOnClickListener { listener?.onDeleteClicked(position) diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt index fdc4896..20c44ae 100644 --- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt @@ -120,14 +120,12 @@ override fun onShowMoreClicked(position: Int) { // deviceViewModel.obtainDeviceDetail(dataBeans[position].deviceCode) -// //更改数据库里通知状态 -// DataBaseManager.instance.updateLocaleMessageById( -// userId, dataBeans[position].messageId -// ) -// messageAdapter.notifyItemChanged(position) -// messageAdapter.notifyItemRangeChanged( -// position, dataBeans.size - position -// ) + //更改数据库里通知状态 + messageViewModel.updateMessageById(dataBeans[position].id, "1") + messageAdapter.notifyItemChanged(position) + messageAdapter.notifyItemRangeChanged( + position, dataBeans.size - position + ) } }) } diff --git a/app/src/main/java/com/casic/br/model/PushMessageModel.java b/app/src/main/java/com/casic/br/model/PushMessageModel.java index f6aed42..8741687 100644 --- a/app/src/main/java/com/casic/br/model/PushMessageModel.java +++ b/app/src/main/java/com/casic/br/model/PushMessageModel.java @@ -67,6 +67,7 @@ private String ids; private String messageCode; private String messageContent; + private String messageStatus; private String messageTitle; private String provinceList; private String targetUsers; @@ -113,6 +114,14 @@ this.messageContent = messageContent; } + public String getMessageStatus() { + return messageStatus; + } + + public void setMessageStatus(String messageStatus) { + this.messageStatus = messageStatus; + } + public String getMessageTitle() { return messageTitle; } diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 19e036a..8c55803 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -127,11 +127,20 @@ ): String /** - * Banner + * 删除消息 */ @POST("/appPushInfo/delete") suspend fun deleteMessageById( @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 更新消息 + */ + @POST("/appPushInfo/update") + suspend fun updateMessageById( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt index acb5464..789ff25 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt @@ -294,4 +294,17 @@ ) return api.deleteMessageById(AuthenticationHelper.token!!, requestBody) } + + /** + * 更新消息 + */ + suspend fun updateMessageById(id: String, messageStatus: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + paramObject.put("messageStatus", messageStatus) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.updateMessageById(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt index 82b52a1..eade48d 100644 --- a/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/MessageListAdapter.kt @@ -29,12 +29,12 @@ holder.dateView.text = rowsBean.createTime holder.titleView.text = rowsBean.messageTitle holder.contentView.text = rowsBean.messageContent -// val state = if (rowsBean.isRead == "0") { -// View.VISIBLE -// } else { -// View.INVISIBLE -// } -// holder.readStateView.visibility = state + val state = if (rowsBean.messageStatus == "0") { + View.VISIBLE + } else { + View.INVISIBLE + } + holder.readStateView.visibility = state //绑定事件 holder.deleteView.setOnClickListener { listener?.onDeleteClicked(position) diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt index fdc4896..20c44ae 100644 --- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt @@ -120,14 +120,12 @@ override fun onShowMoreClicked(position: Int) { // deviceViewModel.obtainDeviceDetail(dataBeans[position].deviceCode) -// //更改数据库里通知状态 -// DataBaseManager.instance.updateLocaleMessageById( -// userId, dataBeans[position].messageId -// ) -// messageAdapter.notifyItemChanged(position) -// messageAdapter.notifyItemRangeChanged( -// position, dataBeans.size - position -// ) + //更改数据库里通知状态 + messageViewModel.updateMessageById(dataBeans[position].id, "1") + messageAdapter.notifyItemChanged(position) + messageAdapter.notifyItemRangeChanged( + position, dataBeans.size - position + ) } }) } diff --git a/app/src/main/java/com/casic/br/model/PushMessageModel.java b/app/src/main/java/com/casic/br/model/PushMessageModel.java index f6aed42..8741687 100644 --- a/app/src/main/java/com/casic/br/model/PushMessageModel.java +++ b/app/src/main/java/com/casic/br/model/PushMessageModel.java @@ -67,6 +67,7 @@ private String ids; private String messageCode; private String messageContent; + private String messageStatus; private String messageTitle; private String provinceList; private String targetUsers; @@ -113,6 +114,14 @@ this.messageContent = messageContent; } + public String getMessageStatus() { + return messageStatus; + } + + public void setMessageStatus(String messageStatus) { + this.messageStatus = messageStatus; + } + public String getMessageTitle() { return messageTitle; } diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 19e036a..8c55803 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -127,11 +127,20 @@ ): String /** - * Banner + * 删除消息 */ @POST("/appPushInfo/delete") suspend fun deleteMessageById( @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 更新消息 + */ + @POST("/appPushInfo/update") + suspend fun updateMessageById( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt index acb5464..789ff25 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt @@ -294,4 +294,17 @@ ) return api.deleteMessageById(AuthenticationHelper.token!!, requestBody) } + + /** + * 更新消息 + */ + suspend fun updateMessageById(id: String, messageStatus: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + paramObject.put("messageStatus", messageStatus) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.updateMessageById(AuthenticationHelper.token!!, requestBody) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/vm/MessageViewModel.kt b/app/src/main/java/com/casic/br/vm/MessageViewModel.kt index 95cdc00..d37e1e6 100644 --- a/app/src/main/java/com/casic/br/vm/MessageViewModel.kt +++ b/app/src/main/java/com/casic/br/vm/MessageViewModel.kt @@ -44,4 +44,14 @@ }, { it.printStackTrace() }) + + fun updateMessageById(id: String, messageStatus: String) = launch({ + val response = RetrofitServiceManager.updateMessageById(id, messageStatus) + val responseCode = response.separateResponseCode() + if (responseCode != 200) { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) } \ No newline at end of file