xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改文案

Browse Source
This commit is contained in:
guozhen
2025-01-07 10:46:44 +08:00
committed by xuhuixiang
parent ba8e40323d
commit f009c459ee
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -47,8 +47,8 @@ android {
applicationId = "com.dskj.rbchat" applicationId = "com.dskj.rbchat"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 198 versionCode = 199
versionName = "1.9.8" versionName = "1.9.9"
multiDexEnabled = true multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式

5
app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java
View File

@@ -352,10 +352,11 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
conversationViewTop.addData(list); conversationViewTop.addData(list);
conversationViewTop.addStickTop(team.getId()); conversationViewTop.addStickTop(team.getId());
} }
// Collections.sort(conversationViewTop.getAdatper().getConversationList(), conversationShiJieComparator); Collections.sort(conversationViewTop.getAdatper().getConversationList(), conversationShiJieComparator);
// conversationViewTop.setData(conversationViewTop.getAdatper().getConversationList()); conversationViewTop.setData(conversationViewTop.getAdatper().getConversationList());
} }
} else if (conversationType == 2) { } else if (conversationType == 2) {
ConversationBean conversationBeanItem = null; ConversationBean conversationBeanItem = null;

2
app/src/main/java/com/dskj/rbchat/welcome/WelcomeActivity.java
View File

@@ -280,7 +280,7 @@ public class WelcomeActivity extends BaseActivity {
} }
private void showMainActivityAndFinish() { private void showMainActivityAndFinish() {
activityWelcomeBinding.lottieView.cancelAnimation();
ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish"); ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClass(this, MainActivity.class); intent.setClass(this, MainActivity.class);

3
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -355,7 +355,8 @@
<string name="remarks_hit_txt">恭喜發財，大吉大利</string> <string name="remarks_hit_txt">恭喜發財，大吉大利</string>
<string name="send_in_redenvelope_txt1">塞Cash進紅包</string> <string name="send_in_redenvelope_txt1">塞Cash進紅包</string>
<string name="send_in_redtype_txt1">塞金幣進紅包</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="zhuanzhangobject_txt">點選選擇贈送對象</string>
<string name="zhuanzhangjine_txt">贈送數量</string> <string name="zhuanzhangjine_txt">贈送數量</string>
<string name="zhuanzhangjineto_txt">贈送給:%s</string> <string name="zhuanzhangjineto_txt">贈送給:%s</string>

4
app/src/main/res/values-zh/strings.xml
View File

@@ -357,9 +357,9 @@
<string name="danwei_txt">个</string> <string name="danwei_txt">个</string>
<string name="remarks_hit_txt">恭喜发财，大吉大利</string> <string name="remarks_hit_txt">恭喜发财，大吉大利</string>
<string name="send_in_redenvelope_txt1">塞Cash进红包</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="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="zhuanzhangobject_txt">点击选择赠送对象</string>
<string name="zhuanzhangjine_txt">赠送数量</string> <string name="zhuanzhangjine_txt">赠送数量</string>
<string name="zhuanzhangjineto_txt">赠送给:%s</string> <string name="zhuanzhangjineto_txt">赠送给:%s</string>

4
app/src/main/res/values/strings.xml
View File

@@ -357,9 +357,9 @@
<string name="danwei_txt">个</string> <string name="danwei_txt">个</string>
<string name="remarks_hit_txt">恭喜发财，大吉大利</string> <string name="remarks_hit_txt">恭喜发财，大吉大利</string>
<string name="send_in_redenvelope_txt1">塞Cash进红包</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="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="zhuanzhangobject_txt">点击选择赠送对象</string>
<string name="zhuanzhangjine_txt">赠送数量</string> <string name="zhuanzhangjine_txt">赠送数量</string>
<string name="zhuanzhangjineto_txt">赠送给:%s</string> <string name="zhuanzhangjineto_txt">赠送给:%s</string>