From 12469bb6f0847cf7148ff3f8ddbe40b2ff0d2352 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 12 Jan 2023 14:05:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                       |  4 ++--
 .../volvo/repository/network/MessagePagingSource.kt    | 10 +++++-----
 .../ui/fragments/message/ObtainMessageFragment.kt      | 10 ++++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 16b9fb3..c477436 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "com.navinfo.volvo"
         minSdk 24
         targetSdk 32
-        versionCode 1
-        versionName "1.1"
+        versionCode 2
+        versionName "20230112"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/navinfo/volvo/repository/network/MessagePagingSource.kt b/app/src/main/java/com/navinfo/volvo/repository/network/MessagePagingSource.kt
index db9776a..d23c17b 100644
--- a/app/src/main/java/com/navinfo/volvo/repository/network/MessagePagingSource.kt
+++ b/app/src/main/java/com/navinfo/volvo/repository/network/MessagePagingSource.kt
@@ -36,11 +36,11 @@ class MessagePagingSource(
                         data?.let { d ->
                             if (d.rows != null) {
                                 list = d.rows
-                                for (item in list){
-                                    if(item.version == Constant.message_version_right_off && item.status == Constant.message_status_late){
-                                        item.status = Constant.message_status_send_over
-                                    }
-                                }
+//                                for (item in list){
+//                                    if(item.version == Constant.message_version_right_off && item.status == Constant.message_status_late){
+//                                        item.status = Constant.message_status_send_over
+//                                    }
+//                                }
                             }
                         }
                     } else {
diff --git a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
index 79dab23..824fc82 100644
--- a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
+++ b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
@@ -187,8 +187,7 @@ class ObtainMessageFragment : Fragment() {
         if (obtainMessageViewModel.getMessageLiveData().value != null
         ) {
             if (!"".equals((obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)
-                &&
-                !Constant.message_status_late.equals(
+                &&!Constant.message_status_late.equals(
                     (obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)
             ) {
                 binding.tvMessageTitle.isEnabled = false
@@ -204,9 +203,12 @@ class ObtainMessageFragment : Fragment() {
                 binding.tvAudioName.isEnabled = false
                 binding.imgPhotoDelete.isEnabled = false
                 binding.imgAudioDelete.isEnabled = false
-                binding.btnObtainMessageConfirm.text = "确认提交"
+            }
+
+            if (!"".equals((obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)) {
+                binding.btnObtainMessageConfirm.text = "保存修改"
             } else {
-                binding.btnObtainMessageConfirm.text = "修改保存"
+                binding.btnObtainMessageConfirm.text = "确认提交"
             }
         }