From f009c459ee57fc9fbd12691fb2d28ef460e09a52 Mon Sep 17 00:00:00 2001
From: guozhen <878631970@qq.com>
Date: Tue, 7 Jan 2025 10:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                         | 4 ++--
 .../com/dskj/rbchat/main/chat/ChatConversationFragment.java  | 5 +++--
 .../main/java/com/dskj/rbchat/welcome/WelcomeActivity.java   | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml                   | 3 ++-
 app/src/main/res/values-zh/strings.xml                       | 4 ++--
 app/src/main/res/values/strings.xml                          | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7afae17..b3bd818 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         applicationId = "com.dskj.rbchat"
         minSdk = 24
         targetSdk = 34
-        versionCode = 198
-        versionName = "1.9.8"
+        versionCode = 199
+        versionName = "1.9.9"
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"  //正式
diff --git a/app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java b/app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java
index 37a0163..7049a86 100644
--- a/app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java
+++ b/app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java
@@ -352,10 +352,11 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
                     conversationViewTop.addData(list);
                     conversationViewTop.addStickTop(team.getId());
                 }
-//                Collections.sort(conversationViewTop.getAdatper().getConversationList(), conversationShiJieComparator);
-//                conversationViewTop.setData(conversationViewTop.getAdatper().getConversationList());
+                Collections.sort(conversationViewTop.getAdatper().getConversationList(), conversationShiJieComparator);
+                conversationViewTop.setData(conversationViewTop.getAdatper().getConversationList());
             }
 
+
         } else if (conversationType == 2) {
             ConversationBean conversationBeanItem = null;
 
diff --git a/app/src/main/java/com/dskj/rbchat/welcome/WelcomeActivity.java b/app/src/main/java/com/dskj/rbchat/welcome/WelcomeActivity.java
index 653afd8..7a0f453 100644
--- a/app/src/main/java/com/dskj/rbchat/welcome/WelcomeActivity.java
+++ b/app/src/main/java/com/dskj/rbchat/welcome/WelcomeActivity.java
@@ -280,7 +280,7 @@ public class WelcomeActivity extends BaseActivity {
     }
 
     private void showMainActivityAndFinish() {
-
+        activityWelcomeBinding.lottieView.cancelAnimation();
         ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
         Intent intent = new Intent();
         intent.setClass(this, MainActivity.class);
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a24df9e..3258583 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -355,7 +355,8 @@
     <string name="remarks_hit_txt">恭喜發財，大吉大利</string>
     <string name="send_in_redenvelope_txt1">塞Cash進紅包</string>
     <string name="send_in_redtype_txt1">塞金幣進紅包</string>
-    <string name="no_get_to_back_txt">未領取的紅包，將於24小時候退回</string>
+    <string name="send_in_lipinjifen_txt1">塞禮品積分紅包</string>
+    <string name="no_get_to_back_txt">未領取的紅包，將於24小時退回</string>
     <string name="zhuanzhangobject_txt">點選選擇贈送對象</string>
     <string name="zhuanzhangjine_txt">贈送數量</string>
     <string name="zhuanzhangjineto_txt">贈送給:%s</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f8fe884..5d909fd 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -357,9 +357,9 @@
     <string name="danwei_txt">个</string>
     <string name="remarks_hit_txt">恭喜发财，大吉大利</string>
     <string name="send_in_redenvelope_txt1">塞Cash进红包</string>
-    <string name="send_in_lipinjifen_txt1">塞礼品积分紅包</string>
+    <string name="send_in_lipinjifen_txt1">塞礼品积分红包</string>
     <string name="send_in_redtype_txt1">塞金币进红包</string>
-    <string name="no_get_to_back_txt">未领取的红包，将于24小时候退回</string>
+    <string name="no_get_to_back_txt">未领取的红包，将于24小时退回</string>
     <string name="zhuanzhangobject_txt">点击选择赠送对象</string>
     <string name="zhuanzhangjine_txt">赠送数量</string>
     <string name="zhuanzhangjineto_txt">赠送给:%s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb4b6b4..0c122bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -357,9 +357,9 @@
     <string name="danwei_txt">个</string>
     <string name="remarks_hit_txt">恭喜发财，大吉大利</string>
     <string name="send_in_redenvelope_txt1">塞Cash进红包</string>
-    <string name="send_in_lipinjifen_txt1">塞礼品积分紅包</string>
+    <string name="send_in_lipinjifen_txt1">塞礼品积分红包</string>
     <string name="send_in_redtype_txt1">塞金币进红包</string>
-    <string name="no_get_to_back_txt">未领取的红包，将于24小时候退回</string>
+    <string name="no_get_to_back_txt">未领取的红包，将于24小时退回</string>
     <string name="zhuanzhangobject_txt">点击选择赠送对象</string>
     <string name="zhuanzhangjine_txt">赠送数量</string>
     <string name="zhuanzhangjineto_txt">赠送给:%s</string>