xiaoyan159/RealmTest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 修改bug

Browse Source
This commit is contained in:
xiaoyan 2023-01-12 14:05:07 +08:00
parent 5e597accf9
commit 12469bb6f0
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -20,8 +20,8 @@ android {
applicationId "com.navinfo.volvo" applicationId "com.navinfo.volvo"
minSdk 24 minSdk 24
targetSdk 32 targetSdk 32
versionCode 1 versionCode 2
versionName "1.1" versionName "20230112"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

10
app/src/main/java/com/navinfo/volvo/repository/network/MessagePagingSource.kt
View File

@ -36,11 +36,11 @@ class MessagePagingSource(
data?.let { d -> data?.let { d ->
if (d.rows != null) { if (d.rows != null) {
list = d.rows list = d.rows
for (item in list){ // for (item in list){
if(item.version == Constant.message_version_right_off && item.status == Constant.message_status_late){ // if(item.version == Constant.message_version_right_off && item.status == Constant.message_status_late){
item.status = Constant.message_status_send_over // item.status = Constant.message_status_send_over
} // }
} // }
} }
} }
} else { } else {

10
app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
View File

@ -187,8 +187,7 @@ class ObtainMessageFragment : Fragment() {
if (obtainMessageViewModel.getMessageLiveData().value != null if (obtainMessageViewModel.getMessageLiveData().value != null
) { ) {
if (!"".equals((obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status) if (!"".equals((obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)
&& &&!Constant.message_status_late.equals(
!Constant.message_status_late.equals(
(obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status) (obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)
) { ) {
binding.tvMessageTitle.isEnabled = false binding.tvMessageTitle.isEnabled = false
@ -204,9 +203,12 @@ class ObtainMessageFragment : Fragment() {
binding.tvAudioName.isEnabled = false binding.tvAudioName.isEnabled = false
binding.imgPhotoDelete.isEnabled = false binding.imgPhotoDelete.isEnabled = false
binding.imgAudioDelete.isEnabled = false binding.imgAudioDelete.isEnabled = false
binding.btnObtainMessageConfirm.text = "确认提交" }
if (!"".equals((obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)) {
binding.btnObtainMessageConfirm.text = "保存修改"
} else { } else {
binding.btnObtainMessageConfirm.text = "修改保存" binding.btnObtainMessageConfirm.text = "确认提交"
} }
} }