diff --git a/Share/src/main/res/values-zh/strings.xml b/Share/src/main/res/values-zh/strings.xml
index ec54569a2..ff510adfa 100644
--- a/Share/src/main/res/values-zh/strings.xml
+++ b/Share/src/main/res/values-zh/strings.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="com.twitter.sdk.android.CONSUMER_KEY" >ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
-<string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
+    <string name="com.twitter.sdk.android.CONSUMER_KEY">ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
+    <string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
 
-<string name="dialog_share_title">分享</string>
-<string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
-<string name="dialog_share_app_facebook" >Facebook</string>
-<string name="dialog_share_app_line" >Line</string>
-<string name="dialog_share_app_twitter">Twitter</string>
-<string name="dialog_share_app_whatsapp" >WhatsApp</string>
-<string name="dialog_share_app_messenger">Messenger</string>
-<string name="dialog_share_app_instagram" >Instagram</string>
+    <string name="dialog_share_title">分享</string>
+    <string name="dialog_share_app_internal">站內好友</string>
+    <string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
+    <string name="dialog_share_app_facebook">Facebook</string>
+    <string name="dialog_share_app_line">Line</string>
+    <string name="dialog_share_app_twitter">Twitter</string>
+    <string name="dialog_share_app_whatsapp">WhatsApp</string>
+    <string name="dialog_share_app_messenger">Messenger</string>
+    <string name="dialog_share_app_instagram">Instagram</string>
 
-<string name="dialog_invite_title">邀請好友</string>
-<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
-<string name="dialog_share_copy">複製</string>
+    <string name="dialog_invite_title">邀請好友</string>
+    <string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
+    <string name="dialog_share_copy">複製</string>
 </resources>
\ No newline at end of file
diff --git a/Share/src/main/res/values/strings.xml b/Share/src/main/res/values/strings.xml
index 7702b2fc7..8388037b0 100644
--- a/Share/src/main/res/values/strings.xml
+++ b/Share/src/main/res/values/strings.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+        <string name="dialog_share_title">Share</string>
+        <string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
+        <string name="dialog_invite_title">Invite Friends</string>
+        <string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
+        <string name="dialog_share_copy">Copy</string>
+        <string name="dialog_share_app_internal">Site friends</string>
+        <string name="dialog_share_internal_title">Share To</string>
+        <string name="dialog_share_internal_cancel">cancel</string>
+        <string name="dialog_share_internal_search">Search nickname</string>
+        <string name="dialog_share_internal_list_btn">Send</string>
+        <string name="dialog_share_success">Share success</string>
+        <string name="dialog_share_success_btn">Go chat</string>
+        <string name="dialog_share_failure_not_select">Please select friends</string>
 
-    <string name="dialog_share_title">分享</string>
-    <string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
-    <string name="dialog_share_app_facebook" translatable="false">Facebook</string>
-    <string name="dialog_share_app_line" translatable="false">Line</string>
-    <string name="dialog_share_app_twitter" translatable="false">Twitter</string>
-    <string name="dialog_share_app_whatsapp" translatable="false">WhatsApp</string>
-    <string name="dialog_share_app_messenger" translatable="false">Messenger</string>
-    <string name="dialog_share_app_instagram" translatable="false">Instagram</string>
-    <string name="dialog_share_app_internal">站內好友</string>
-
-    <string name="dialog_invite_title">邀請好友</string>
-    <string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
-    <string name="dialog_share_copy">複製</string>
-    <string name="dialog_share_internal_title">分享至</string>
-    <string name="dialog_share_internal_search">搜索昵稱</string>
-    <string name="dialog_share_internal_list_btn">發送</string>
-    <string name="dialog_share_success">分享成功</string>
-    <string name="dialog_share_success_btn">去聊聊</string>
-    <string name="dialog_share_failure_not_select">请选择好友</string>
+        <string name="dialog_share_app_facebook" >Facebook</string>
+        <string name="dialog_share_app_line" >Line</string>
+        <string name="dialog_share_app_twitter">Twitter</string>
+        <string name="dialog_share_app_whatsapp" >WhatsApp</string>
+        <string name="dialog_share_app_messenger">Messenger</string>
+        <string name="dialog_share_app_instagram" >Instagram</string>
 
 </resources>
\ No newline at end of file
diff --git a/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java b/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java
index 91f9417cf..f965682f2 100644
--- a/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java
@@ -19,6 +19,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.message.content.MessageChatCardContent;
 import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.DateFormatUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ViewUtils;
@@ -39,8 +40,11 @@ import io.rong.imkit.widget.adapter.ViewHolder;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
+import io.rong.message.HQVoiceMessage;
+import io.rong.message.ImageMessage;
 import io.rong.message.SightMessage;
 import io.rong.message.TextMessage;
+import io.rong.message.VoiceMessage;
 
 public class MainConversationListAdapter extends ConversationListAdapter {
     public static final int TYPE_SEARCH_TITLE = 500;
@@ -134,6 +138,7 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         Log.i("列表", "bindDefault: 用户名字:" + conversation.mCore.getConversationTitle());
         ImgLoader.display(holder.getContext(), conversation.mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait));
         holder.setText(R.id.rc_conversation_title, conversation.mCore.getConversationTitle());
+        ((TextView) holder.getView(R.id.rc_conversation_content)).setText(ChatMsgTypeUtils.getMsg(conversation.mConversationContent.toString()));
         if (conversation.mCore.getSentTime() != -1 && holder.getView(R.id.rc_conversation_date) != null) {
             holder.setText(R.id.rc_conversation_date, DateFormatUtil.getDateTimeString(conversation.mCore.getSentTime(), true, holder.getContext()));
             holder.getView(R.id.rc_conversation_date).setVisibility(View.VISIBLE);
@@ -337,10 +342,15 @@ public class MainConversationListAdapter extends ConversationListAdapter {
                 conversation.mCore.setUnreadMessageCount(integer);
                 if(bean.getContent() instanceof SightMessage){
                     conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[小視頻]":"[Video]");
-                }else{
+                }else if(bean.getContent() instanceof HQVoiceMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[語音]":"[Voice]");
+                } else if(bean.getContent() instanceof ImageMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[圖片]":"[picture]");
+                }else if(bean.getContent() instanceof MessageChatCardContent){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[站內分享]":"[In-app sharing]");
+                } else{
                     conversation.mConversationContent = new SpannableString(((TextMessage) bean.getContent()).getContent());
                 }
-
                 mDataList.set(id, conversation);
                 notifyItemChanged(id);
             }
diff --git a/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java b/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
index c33012e1f..2f67b9582 100644
--- a/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
@@ -87,7 +87,7 @@ public class LiveTaskModel extends BaseModel {
 
         public String getEndTime() {
             if (!StringUtil.isEmpty(endTime)) {
-                endTime =WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
+                endTime = new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
             }
             return endTime;
         }
diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
index 6b554682f..3ca287050 100644
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
@@ -277,7 +277,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
 
     void initData() {
         adapter.setList_type(list_type);
-        if (isAnchor) {
+        if (isAnchor || (isTab2Enter && isStar)) {
             if (isStar) {
                 gift_hall_type = 2;
             } else {
diff --git a/common/src/main/java/com/yunbao/common/dialog/MessageChatNotifyDialog.java b/common/src/main/java/com/yunbao/common/dialog/MessageChatNotifyDialog.java
index 7810da689..a9b2ab4dd 100644
--- a/common/src/main/java/com/yunbao/common/dialog/MessageChatNotifyDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/MessageChatNotifyDialog.java
@@ -14,6 +14,7 @@ import com.yunbao.common.R;
 import com.yunbao.common.bean.MessageUserInfoBean;
 import com.yunbao.common.custom.RatioRoundImageView;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.StringUtil;
 
@@ -93,7 +94,7 @@ public class MessageChatNotifyDialog extends AbsDialogPositionPopupWindow {
         if (StringUtil.isEmpty(liveBean.getExtras())) {
             ((TextView) findViewById(R.id.description)).setText(liveBean.getUser().getSignature());
         } else {
-            ((TextView) findViewById(R.id.description)).setText(liveBean.getExtras());
+            ((TextView) findViewById(R.id.description)).setText(ChatMsgTypeUtils.getMsg(liveBean.getExtras()));
         }
         new Handler(Looper.getMainLooper()).postDelayed(() -> {
             dismiss();
diff --git a/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java b/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
index 41f81862a..a8478933d 100644
--- a/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
@@ -2,6 +2,7 @@ package com.yunbao.common.fragment;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
 import android.util.Log;
 import android.view.View;
 
@@ -23,6 +24,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
 import com.yunbao.common.adapter.MainConversationListAdapter;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.InstructorRemarkManager;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.StringUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -158,7 +160,7 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
                                 break;
                             }
                         }
-
+                        srcList.get(i).mConversationContent =new SpannableString(ChatMsgTypeUtils.getMsg(srcList.get(i).mConversationContent.toString()));
                     }
                     onRefreshListener.onFinish(srcList);
                     isNet = false;
diff --git a/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java b/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java
index 064807c63..e479828d2 100644
--- a/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java
@@ -3,6 +3,7 @@ package com.yunbao.common.fragment;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +24,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.InstructorRemarkManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.StringUtil;
 
@@ -39,6 +41,7 @@ import io.rong.imkit.widget.refresh.listener.OnRefreshListener;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
 import io.rong.imlib.model.UserInfo;
+import io.rong.message.VoiceMessage;
 
 public class MainMessageChatListFragment extends AbsMainMessageChatListFragment {
     private static final String TAG = "MainMessageChatListFragment";
@@ -72,6 +75,9 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
             @Override
             public void onFinish(List<BaseUiConversation> baseUiConversations) {
                 InstructorRemarkManager.get(mContext).getNetInstructorRemark();
+                for (int i = 0; i <baseUiConversations.size(); i++) {
+                    baseUiConversations.get(i).mCore.getMessage();
+                }
                 loadLiveLookTime(baseUiConversations, new OnRecyclerListRefreshListener<Map<String, Integer>>() {
                     @Override
                     public void onFinish(Map<String, Integer> stringIntegerMap) {
diff --git a/common/src/main/java/com/yunbao/common/utils/ChatMsgTypeUtils.java b/common/src/main/java/com/yunbao/common/utils/ChatMsgTypeUtils.java
new file mode 100644
index 000000000..6492a1f54
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/utils/ChatMsgTypeUtils.java
@@ -0,0 +1,22 @@
+package com.yunbao.common.utils;
+
+/**
+ * 消息类型翻译管理器
+ */
+public class ChatMsgTypeUtils {
+    public static String getMsg(String msg) {
+        String rsult = msg;
+        switch (msg) {
+            case "[小视频]":
+                rsult = WordUtil.isNewZh() ? "[小視頻]" : "[Video]";
+                break;
+            case "[语音]":
+                rsult = WordUtil.isNewZh() ? "[語音]" : "[Voice]";
+                break;
+            case "[图片]":
+                rsult = WordUtil.isNewZh() ? "[圖片]" : "[Image]";
+                break;
+        }
+        return rsult;
+    }
+}
diff --git a/common/src/main/res/mipmap-b+en+us/background_quick_gift_reminder.png b/common/src/main/res/mipmap-b+en+us/background_quick_gift_reminder.png
deleted file mode 100644
index f49f0f4bb..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/background_quick_gift_reminder.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/backgroundn_cinema_ticket_exchange.png b/common/src/main/res/mipmap-b+en+us/backgroundn_cinema_ticket_exchange.png
deleted file mode 100644
index da90a6622..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/backgroundn_cinema_ticket_exchange.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png b/common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png
deleted file mode 100644
index d3d570965..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_cinema_ticket_title.png b/common/src/main/res/mipmap-b+en+us/icon_cinema_ticket_title.png
deleted file mode 100644
index 6520c65c5..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_cinema_ticket_title.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_enjoy_image.png b/common/src/main/res/mipmap-b+en+us/icon_enjoy_image.png
deleted file mode 100644
index 05908804c..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_enjoy_image.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_img_up_label.png b/common/src/main/res/mipmap-b+en+us/icon_img_up_label.png
deleted file mode 100644
index dc1c4a9b4..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_img_up_label.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_liveing.gif b/common/src/main/res/mipmap-b+en+us/icon_liveing.gif
deleted file mode 100644
index c1cd884ca..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_liveing.gif and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_order_rule.png b/common/src/main/res/mipmap-b+en+us/icon_order_rule.png
deleted file mode 100644
index bd9fd3b30..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_order_rule.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_user_game_living.png b/common/src/main/res/mipmap-b+en+us/icon_user_game_living.png
deleted file mode 100644
index f4e9825c5..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/icon_user_game_living.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-b+en+us/recommed_msg_bg.png b/common/src/main/res/mipmap-b+en+us/recommed_msg_bg.png
deleted file mode 100644
index 92929e199..000000000
Binary files a/common/src/main/res/mipmap-b+en+us/recommed_msg_bg.png and /dev/null differ
diff --git a/common/src/main/res/mipmap-mdpi/icon_img_up_label.png b/common/src/main/res/mipmap-mdpi/icon_img_up_label.png
index da7cce3e9..dc1c4a9b4 100644
Binary files a/common/src/main/res/mipmap-mdpi/icon_img_up_label.png and b/common/src/main/res/mipmap-mdpi/icon_img_up_label.png differ
diff --git a/common/src/main/res/mipmap-mdpi/icon_liveing.gif b/common/src/main/res/mipmap-mdpi/icon_liveing.gif
index dee8de098..c1cd884ca 100644
Binary files a/common/src/main/res/mipmap-mdpi/icon_liveing.gif and b/common/src/main/res/mipmap-mdpi/icon_liveing.gif differ
diff --git a/common/src/main/res/mipmap-xxhdpi/background_quick_gift_reminder.png b/common/src/main/res/mipmap-xxhdpi/background_quick_gift_reminder.png
index 40a338914..f49f0f4bb 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/background_quick_gift_reminder.png and b/common/src/main/res/mipmap-xxhdpi/background_quick_gift_reminder.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png b/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png
index 2e5c126a5..d3d570965 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png and b/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_enjoy_image.png b/common/src/main/res/mipmap-xxhdpi/icon_enjoy_image.png
index feee65bff..05908804c 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_enjoy_image.png and b/common/src/main/res/mipmap-xxhdpi/icon_enjoy_image.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_order_rule.png b/common/src/main/res/mipmap-xxhdpi/icon_order_rule.png
index 45f574cdf..bd9fd3b30 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_order_rule.png and b/common/src/main/res/mipmap-xxhdpi/icon_order_rule.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_user_game_living.png b/common/src/main/res/mipmap-xxhdpi/icon_user_game_living.png
index 27922f6ce..f4e9825c5 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_user_game_living.png and b/common/src/main/res/mipmap-xxhdpi/icon_user_game_living.png differ
diff --git a/common/src/main/res/mipmap-b+en+us/icon_user_home_living.gif b/common/src/main/res/mipmap-xxhdpi/icon_user_home_living.gif
similarity index 100%
rename from common/src/main/res/mipmap-b+en+us/icon_user_home_living.gif
rename to common/src/main/res/mipmap-xxhdpi/icon_user_home_living.gif
diff --git a/common/src/main/res/mipmap-xxhdpi/recommed_msg_bg.png b/common/src/main/res/mipmap-xxhdpi/recommed_msg_bg.png
index f07598cdd..92929e199 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/recommed_msg_bg.png and b/common/src/main/res/mipmap-xxhdpi/recommed_msg_bg.png differ
diff --git a/common/src/main/res/mipmap-xxxhdpi/backgroundn_cinema_ticket_exchange.png b/common/src/main/res/mipmap-xxxhdpi/backgroundn_cinema_ticket_exchange.png
index 110da07a0..da90a6622 100644
Binary files a/common/src/main/res/mipmap-xxxhdpi/backgroundn_cinema_ticket_exchange.png and b/common/src/main/res/mipmap-xxxhdpi/backgroundn_cinema_ticket_exchange.png differ
diff --git a/common/src/main/res/mipmap-b+en+us/bg_xyd_button.png b/common/src/main/res/mipmap-xxxhdpi/bg_xyd_button.png
similarity index 100%
rename from common/src/main/res/mipmap-b+en+us/bg_xyd_button.png
rename to common/src/main/res/mipmap-xxxhdpi/bg_xyd_button.png
diff --git a/common/src/main/res/mipmap-b+en+us/dialog_gift_wall_achieve_top_icon.png b/common/src/main/res/mipmap-xxxhdpi/dialog_gift_wall_achieve_top_icon.png
similarity index 100%
rename from common/src/main/res/mipmap-b+en+us/dialog_gift_wall_achieve_top_icon.png
rename to common/src/main/res/mipmap-xxxhdpi/dialog_gift_wall_achieve_top_icon.png
diff --git a/common/src/main/res/mipmap-xxxhdpi/icon_cinema_ticket_title.png b/common/src/main/res/mipmap-xxxhdpi/icon_cinema_ticket_title.png
index c465bfc4d..6520c65c5 100644
Binary files a/common/src/main/res/mipmap-xxxhdpi/icon_cinema_ticket_title.png and b/common/src/main/res/mipmap-xxxhdpi/icon_cinema_ticket_title.png differ
diff --git a/common/src/main/res/mipmap-zh/background_quick_gift_reminder.png b/common/src/main/res/mipmap-zh/background_quick_gift_reminder.png
new file mode 100644
index 000000000..40a338914
Binary files /dev/null and b/common/src/main/res/mipmap-zh/background_quick_gift_reminder.png differ
diff --git a/common/src/main/res/mipmap-zh/backgroundn_cinema_ticket_exchange.png b/common/src/main/res/mipmap-zh/backgroundn_cinema_ticket_exchange.png
new file mode 100644
index 000000000..110da07a0
Binary files /dev/null and b/common/src/main/res/mipmap-zh/backgroundn_cinema_ticket_exchange.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/bg_xyd_button.png b/common/src/main/res/mipmap-zh/bg_xyd_button.png
similarity index 100%
rename from common/src/main/res/mipmap-xxhdpi/bg_xyd_button.png
rename to common/src/main/res/mipmap-zh/bg_xyd_button.png
diff --git a/common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_top_icon.png b/common/src/main/res/mipmap-zh/dialog_gift_wall_achieve_top_icon.png
similarity index 100%
rename from common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_top_icon.png
rename to common/src/main/res/mipmap-zh/dialog_gift_wall_achieve_top_icon.png
diff --git a/common/src/main/res/mipmap-zh/icon_activate_the_elite_battle_order.png b/common/src/main/res/mipmap-zh/icon_activate_the_elite_battle_order.png
new file mode 100644
index 000000000..2e5c126a5
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_activate_the_elite_battle_order.png differ
diff --git a/common/src/main/res/mipmap-zh/icon_cinema_ticket_title.png b/common/src/main/res/mipmap-zh/icon_cinema_ticket_title.png
new file mode 100644
index 000000000..c465bfc4d
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_cinema_ticket_title.png differ
diff --git a/common/src/main/res/mipmap-zh/icon_enjoy_image.png b/common/src/main/res/mipmap-zh/icon_enjoy_image.png
new file mode 100644
index 000000000..feee65bff
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_enjoy_image.png differ
diff --git a/common/src/main/res/mipmap-zh/icon_img_up_label.png b/common/src/main/res/mipmap-zh/icon_img_up_label.png
new file mode 100644
index 000000000..da7cce3e9
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_img_up_label.png differ
diff --git a/common/src/main/res/mipmap-zh/icon_liveing.gif b/common/src/main/res/mipmap-zh/icon_liveing.gif
new file mode 100644
index 000000000..dee8de098
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_liveing.gif differ
diff --git a/common/src/main/res/mipmap-zh/icon_order_rule.png b/common/src/main/res/mipmap-zh/icon_order_rule.png
new file mode 100644
index 000000000..45f574cdf
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_order_rule.png differ
diff --git a/common/src/main/res/mipmap-zh/icon_user_game_living.png b/common/src/main/res/mipmap-zh/icon_user_game_living.png
new file mode 100644
index 000000000..27922f6ce
Binary files /dev/null and b/common/src/main/res/mipmap-zh/icon_user_game_living.png differ
diff --git a/common/src/main/res/mipmap-mdpi/icon_user_home_living.gif b/common/src/main/res/mipmap-zh/icon_user_home_living.gif
similarity index 100%
rename from common/src/main/res/mipmap-mdpi/icon_user_home_living.gif
rename to common/src/main/res/mipmap-zh/icon_user_home_living.gif
diff --git a/common/src/main/res/mipmap-zh/recommed_msg_bg.png b/common/src/main/res/mipmap-zh/recommed_msg_bg.png
new file mode 100644
index 000000000..f07598cdd
Binary files /dev/null and b/common/src/main/res/mipmap-zh/recommed_msg_bg.png differ
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 7f2cdbe6a..e59cb38c7 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -812,6 +812,7 @@ Limited ride And limited avatar frame</string>
 
     <string name="random_pk_dialog_apply">accept</string>
     <string name="random_pk_dialog_refuse">refuse</string>
+    <string name="random_pk_dialog_refuse_again">Persist in refusing</string>
     <string name="random_pk_dialog_title">Random PK hint</string>
 
     <string name="speech_robot_setup">Automatic speech robot setup</string>
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
index 8de0bf184..d98283368 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
@@ -1899,6 +1899,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
                 .setIcon("https://downs.yaoulive.com/xzs_tab.png")
                 .setNameColor("#f19ec2")
                 .setSystemBubble("https://downs.yaoulive.com/xzs_qipao.9.png")
+                .setIconEn("https://downs.yaoulive.com/Robot_en.png")
                 .setUserName("")
                 .setContent(content);
         SocketSendBean msg =
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
index 12733abfb..18642bc1d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -836,7 +836,11 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         @Override
                         public void onSuccess(GiftNamingInfoModel data) {
                             if (TextUtils.equals(data.getNamingStatus(), "1")) {
+                                boolean isPageGift = liveGiftModel.isPageGift();
                                 liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class);
+                                liveGiftModel.setPageGift(isPageGift);
+                                liveGiftModel.setGift_id(giftId);
+                                liveGiftModel.setId(giftId);
                                 if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
                                         !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
                                         !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
index e5c0565d0..175748ff9 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
@@ -147,7 +147,7 @@ public class LiveTaskDialog extends AbsDialogPopupWindow {
         if (task.isNew()) {
             newStarImg.setVisibility(VISIBLE);
             newStarTime.setVisibility(VISIBLE);
-            newStarTime.setText(task.getEndTime());
+            newStarTime.setText(WordUtil.isNewZh()?"新秀主播時效截止至 ":"The statute of limitations for new anchors expires " +task.getEndTime());
         }
     }
 
diff --git a/live/src/main/res/layout/dialog_live_data.xml b/live/src/main/res/layout/dialog_live_data.xml
index d38297bab..32b2fd304 100644
--- a/live/src/main/res/layout/dialog_live_data.xml
+++ b/live/src/main/res/layout/dialog_live_data.xml
@@ -36,9 +36,9 @@
                 android:textSize="16sp" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="0.1"
+                android:layout_weight="1"
                 android:gravity="end|center"
                 android:orientation="horizontal">
 
@@ -46,12 +46,15 @@
                     android:id="@+id/live_data_img"
                     android:layout_width="13dp"
                     android:layout_height="13dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginEnd="5dp"
                     tools:srcCompat="@mipmap/icon_free_pk_waring" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:textSize="14dp"
                     android:text="@string/live_data_msg2"
                     android:textColor="#595959" />
             </LinearLayout>
diff --git a/live/src/main/res/layout/dialog_live_task.xml b/live/src/main/res/layout/dialog_live_task.xml
index 46ffd45a9..33cbfd9ca 100644
--- a/live/src/main/res/layout/dialog_live_task.xml
+++ b/live/src/main/res/layout/dialog_live_task.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="600dp"
-
     android:background="#000002">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -24,11 +23,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:layout_marginEnd="14dp"
             android:textColor="#FFFFFF"
             android:textSize="12sp"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
diff --git a/live/src/main/res/mipmap-b+en+us/dialog_task_info.png b/live/src/main/res/mipmap-b+en+us/dialog_task_info.png
deleted file mode 100644
index 8c63dad23..000000000
Binary files a/live/src/main/res/mipmap-b+en+us/dialog_task_info.png and /dev/null differ
diff --git a/live/src/main/res/mipmap-b+en+us/dialog_task_new_star.png b/live/src/main/res/mipmap-b+en+us/dialog_task_new_star.png
deleted file mode 100644
index 3f8ee5521..000000000
Binary files a/live/src/main/res/mipmap-b+en+us/dialog_task_new_star.png and /dev/null differ
diff --git a/live/src/main/res/mipmap-b+en+us/guard_btn_buy_first_icon.png b/live/src/main/res/mipmap-b+en+us/guard_btn_buy_first_icon.png
deleted file mode 100644
index 32d187f9d..000000000
Binary files a/live/src/main/res/mipmap-b+en+us/guard_btn_buy_first_icon.png and /dev/null differ
diff --git a/live/src/main/res/mipmap-b+en+us/guardian_img_wings.png b/live/src/main/res/mipmap-b+en+us/guardian_img_wings.png
deleted file mode 100644
index e73da0aad..000000000
Binary files a/live/src/main/res/mipmap-b+en+us/guardian_img_wings.png and /dev/null differ
diff --git a/live/src/main/res/mipmap-b+en+us/bixin.png b/live/src/main/res/mipmap-xhdpi/bixin.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/bixin.png
rename to live/src/main/res/mipmap-xhdpi/bixin.png
diff --git a/live/src/main/res/mipmap-b+en+us/btn_attention.png b/live/src/main/res/mipmap-xhdpi/btn_attention.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/btn_attention.png
rename to live/src/main/res/mipmap-xhdpi/btn_attention.png
diff --git a/live/src/main/res/mipmap-xhdpi/dialog_task_info.png b/live/src/main/res/mipmap-xhdpi/dialog_task_info.png
index 7627e345e..8c63dad23 100644
Binary files a/live/src/main/res/mipmap-xhdpi/dialog_task_info.png and b/live/src/main/res/mipmap-xhdpi/dialog_task_info.png differ
diff --git a/live/src/main/res/mipmap-xhdpi/dialog_task_new_star.png b/live/src/main/res/mipmap-xhdpi/dialog_task_new_star.png
index 6673b3e89..3f8ee5521 100644
Binary files a/live/src/main/res/mipmap-xhdpi/dialog_task_new_star.png and b/live/src/main/res/mipmap-xhdpi/dialog_task_new_star.png differ
diff --git a/live/src/main/res/mipmap-b+en+us/drpkend.gif b/live/src/main/res/mipmap-xhdpi/drpkend.gif
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/drpkend.gif
rename to live/src/main/res/mipmap-xhdpi/drpkend.gif
diff --git a/live/src/main/res/mipmap-b+en+us/gift_naming_icon.png b/live/src/main/res/mipmap-xhdpi/gift_naming_icon.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/gift_naming_icon.png
rename to live/src/main/res/mipmap-xhdpi/gift_naming_icon.png
diff --git a/live/src/main/res/mipmap-b+en+us/grayicon.png b/live/src/main/res/mipmap-xhdpi/grayicon.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/grayicon.png
rename to live/src/main/res/mipmap-xhdpi/grayicon.png
diff --git a/live/src/main/res/mipmap-xhdpi/guard_btn_buy_first_icon.png b/live/src/main/res/mipmap-xhdpi/guard_btn_buy_first_icon.png
index 18bc540c9..32d187f9d 100644
Binary files a/live/src/main/res/mipmap-xhdpi/guard_btn_buy_first_icon.png and b/live/src/main/res/mipmap-xhdpi/guard_btn_buy_first_icon.png differ
diff --git a/live/src/main/res/mipmap-b+en+us/guard_btn_buy_icon.png b/live/src/main/res/mipmap-xhdpi/guard_btn_buy_icon.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/guard_btn_buy_icon.png
rename to live/src/main/res/mipmap-xhdpi/guard_btn_buy_icon.png
diff --git a/live/src/main/res/mipmap-b+en+us/guard_notice.png b/live/src/main/res/mipmap-xhdpi/guard_notice.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/guard_notice.png
rename to live/src/main/res/mipmap-xhdpi/guard_notice.png
diff --git a/live/src/main/res/mipmap-b+en+us/guardian_img_wings_p.png b/live/src/main/res/mipmap-xhdpi/guardian_img_wings_p.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/guardian_img_wings_p.png
rename to live/src/main/res/mipmap-xhdpi/guardian_img_wings_p.png
diff --git a/live/src/main/res/mipmap-b+en+us/ic_guard_not.png b/live/src/main/res/mipmap-xhdpi/ic_guard_not.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/ic_guard_not.png
rename to live/src/main/res/mipmap-xhdpi/ic_guard_not.png
diff --git a/live/src/main/res/mipmap-b+en+us/ic_live_user_mailbox.png b/live/src/main/res/mipmap-xhdpi/ic_live_user_mailbox.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/ic_live_user_mailbox.png
rename to live/src/main/res/mipmap-xhdpi/ic_live_user_mailbox.png
diff --git a/live/src/main/res/mipmap-b+en+us/icon_blind_box_headlines.png b/live/src/main/res/mipmap-xhdpi/icon_blind_box_headlines.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/icon_blind_box_headlines.png
rename to live/src/main/res/mipmap-xhdpi/icon_blind_box_headlines.png
diff --git a/live/src/main/res/mipmap-b+en+us/icon_cange.png b/live/src/main/res/mipmap-xhdpi/icon_cange.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/icon_cange.png
rename to live/src/main/res/mipmap-xhdpi/icon_cange.png
diff --git a/live/src/main/res/mipmap-xhdpi/icon_main_live_type_1.png b/live/src/main/res/mipmap-xhdpi/icon_main_live_type_1.png
index c5588a53f..efcc58227 100644
Binary files a/live/src/main/res/mipmap-xhdpi/icon_main_live_type_1.png and b/live/src/main/res/mipmap-xhdpi/icon_main_live_type_1.png differ
diff --git a/live/src/main/res/mipmap-b+en+us/img_guardian_empty.png b/live/src/main/res/mipmap-xhdpi/img_guardian_empty.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/img_guardian_empty.png
rename to live/src/main/res/mipmap-xhdpi/img_guardian_empty.png
diff --git a/live/src/main/res/mipmap-b+en+us/img_guardian_online.png b/live/src/main/res/mipmap-xhdpi/img_guardian_online.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/img_guardian_online.png
rename to live/src/main/res/mipmap-xhdpi/img_guardian_online.png
diff --git a/live/src/main/res/mipmap-b+en+us/report_add.png b/live/src/main/res/mipmap-xhdpi/report_add.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/report_add.png
rename to live/src/main/res/mipmap-xhdpi/report_add.png
diff --git a/live/src/main/res/mipmap-b+en+us/sh_img_title.png b/live/src/main/res/mipmap-xhdpi/sh_img_title.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/sh_img_title.png
rename to live/src/main/res/mipmap-xhdpi/sh_img_title.png
diff --git a/live/src/main/res/mipmap-b+en+us/super_notice.png b/live/src/main/res/mipmap-xhdpi/super_notice.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/super_notice.png
rename to live/src/main/res/mipmap-xhdpi/super_notice.png
diff --git a/live/src/main/res/mipmap-b+en+us/vip_notice.png b/live/src/main/res/mipmap-xhdpi/vip_notice.png
similarity index 100%
rename from live/src/main/res/mipmap-b+en+us/vip_notice.png
rename to live/src/main/res/mipmap-xhdpi/vip_notice.png
diff --git a/live/src/main/res/mipmap-mdpi/bixin.png b/live/src/main/res/mipmap-zh/bixin.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/bixin.png
rename to live/src/main/res/mipmap-zh/bixin.png
diff --git a/live/src/main/res/mipmap-xxxhdpi/btn_attention.png b/live/src/main/res/mipmap-zh/btn_attention.png
similarity index 100%
rename from live/src/main/res/mipmap-xxxhdpi/btn_attention.png
rename to live/src/main/res/mipmap-zh/btn_attention.png
diff --git a/live/src/main/res/mipmap-zh/dialog_task_info.png b/live/src/main/res/mipmap-zh/dialog_task_info.png
new file mode 100644
index 000000000..7627e345e
Binary files /dev/null and b/live/src/main/res/mipmap-zh/dialog_task_info.png differ
diff --git a/live/src/main/res/mipmap-zh/dialog_task_new_star.png b/live/src/main/res/mipmap-zh/dialog_task_new_star.png
new file mode 100644
index 000000000..6673b3e89
Binary files /dev/null and b/live/src/main/res/mipmap-zh/dialog_task_new_star.png differ
diff --git a/live/src/main/res/mipmap-mdpi/drpkend.gif b/live/src/main/res/mipmap-zh/drpkend.gif
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/drpkend.gif
rename to live/src/main/res/mipmap-zh/drpkend.gif
diff --git a/live/src/main/res/mipmap-zh/gift_naming_icon.png b/live/src/main/res/mipmap-zh/gift_naming_icon.png
new file mode 100644
index 000000000..17a42bb86
Binary files /dev/null and b/live/src/main/res/mipmap-zh/gift_naming_icon.png differ
diff --git a/live/src/main/res/mipmap-mdpi/grayicon.png b/live/src/main/res/mipmap-zh/grayicon.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/grayicon.png
rename to live/src/main/res/mipmap-zh/grayicon.png
diff --git a/live/src/main/res/mipmap-zh/guard_btn_buy_first_icon.png b/live/src/main/res/mipmap-zh/guard_btn_buy_first_icon.png
new file mode 100644
index 000000000..18bc540c9
Binary files /dev/null and b/live/src/main/res/mipmap-zh/guard_btn_buy_first_icon.png differ
diff --git a/live/src/main/res/mipmap-xxxhdpi/guard_btn_buy_icon.png b/live/src/main/res/mipmap-zh/guard_btn_buy_icon.png
similarity index 100%
rename from live/src/main/res/mipmap-xxxhdpi/guard_btn_buy_icon.png
rename to live/src/main/res/mipmap-zh/guard_btn_buy_icon.png
diff --git a/live/src/main/res/mipmap-mdpi/guard_notice.png b/live/src/main/res/mipmap-zh/guard_notice.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/guard_notice.png
rename to live/src/main/res/mipmap-zh/guard_notice.png
diff --git a/live/src/main/res/mipmap-xxxhdpi/guardian_img_wings_p.png b/live/src/main/res/mipmap-zh/guardian_img_wings_p.png
similarity index 100%
rename from live/src/main/res/mipmap-xxxhdpi/guardian_img_wings_p.png
rename to live/src/main/res/mipmap-zh/guardian_img_wings_p.png
diff --git a/common/src/main/res/mipmap-mdpi/ic_guard_not.png b/live/src/main/res/mipmap-zh/ic_guard_not.png
similarity index 100%
rename from common/src/main/res/mipmap-mdpi/ic_guard_not.png
rename to live/src/main/res/mipmap-zh/ic_guard_not.png
diff --git a/live/src/main/res/mipmap-mdpi/ic_live_user_mailbox.png b/live/src/main/res/mipmap-zh/ic_live_user_mailbox.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/ic_live_user_mailbox.png
rename to live/src/main/res/mipmap-zh/ic_live_user_mailbox.png
diff --git a/live/src/main/res/mipmap-mdpi/icon_blind_box_headlines.png b/live/src/main/res/mipmap-zh/icon_blind_box_headlines.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/icon_blind_box_headlines.png
rename to live/src/main/res/mipmap-zh/icon_blind_box_headlines.png
diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_cange.png b/live/src/main/res/mipmap-zh/icon_cange.png
similarity index 100%
rename from live/src/main/res/mipmap-xxxhdpi/icon_cange.png
rename to live/src/main/res/mipmap-zh/icon_cange.png
diff --git a/live/src/main/res/mipmap-zh/icon_main_live_type_1.png b/live/src/main/res/mipmap-zh/icon_main_live_type_1.png
new file mode 100644
index 000000000..c5588a53f
Binary files /dev/null and b/live/src/main/res/mipmap-zh/icon_main_live_type_1.png differ
diff --git a/live/src/main/res/mipmap-mdpi/img_guardian_empty.png b/live/src/main/res/mipmap-zh/img_guardian_empty.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/img_guardian_empty.png
rename to live/src/main/res/mipmap-zh/img_guardian_empty.png
diff --git a/live/src/main/res/mipmap-xxxhdpi/img_guardian_online.png b/live/src/main/res/mipmap-zh/img_guardian_online.png
similarity index 100%
rename from live/src/main/res/mipmap-xxxhdpi/img_guardian_online.png
rename to live/src/main/res/mipmap-zh/img_guardian_online.png
diff --git a/live/src/main/res/mipmap-hdpi/report_add.png b/live/src/main/res/mipmap-zh/report_add.png
similarity index 100%
rename from live/src/main/res/mipmap-hdpi/report_add.png
rename to live/src/main/res/mipmap-zh/report_add.png
diff --git a/live/src/main/res/mipmap-xxxhdpi/sh_img_title.png b/live/src/main/res/mipmap-zh/sh_img_title.png
similarity index 100%
rename from live/src/main/res/mipmap-xxxhdpi/sh_img_title.png
rename to live/src/main/res/mipmap-zh/sh_img_title.png
diff --git a/live/src/main/res/mipmap-mdpi/super_notice.png b/live/src/main/res/mipmap-zh/super_notice.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/super_notice.png
rename to live/src/main/res/mipmap-zh/super_notice.png
diff --git a/live/src/main/res/mipmap-mdpi/vip_notice.png b/live/src/main/res/mipmap-zh/vip_notice.png
similarity index 100%
rename from live/src/main/res/mipmap-mdpi/vip_notice.png
rename to live/src/main/res/mipmap-zh/vip_notice.png
diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml
deleted file mode 100644
index 68cacc9f3..000000000
--- a/live/src/main/res/values-en/strings.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="no_more_day_rank">No one is on the list at the moment</string>
-    <string name="no_more_guard">anchor are waiting at your guard!</string>
-    <string name="no_rank_data">Not on the list</string>
-    <string name="hour_rank">No.%s</string>
-    <string name="hour_rank_not">Not listed</string>
-    <string name="day_rank">Day</string>
-    <string name="week_rank">Weekly</string>
-    <string name="views_rank">Viewers</string>
-    <string name="gurad_rank">Guard</string>
-    <string name="fans">Fans</string>
-    <string name="room_msg">News</string>
-    <string name="live_room_title">Select room type</string>
-    <string name="live_room_public">Public Rooms</string>
-    <string name="live_room_private">Password Rooms</string>
-    <string name="live_room_public_des">Available for all</string>
-    <string name="live_room_private_des">Only those who have the room code can watch</string>
-    <string name="live_room_type_submit">Submit</string>
-    <string name="live_mic_max">The number of voices has reached 3, and no more can be added.</string>
-    <string name="live_task_no1">Consecutive broadcast duration of the day (minutes)</string>
-    <string name="live_task_no2">PK count on the day (unlimited mode)</string>
-    <string name="live_task_fans_no1">Accumulated new followers on that day</string>
-    <string name="live_task_fans_no2">Cumulative new fan group members on that day</string>
-    <string name="live_task_tab1">Live interaction</string>
-    <string name="live_task_tab2">Fan growth</string>
-    <string name="live_task_info_title">Special instructions for anchor tasks</string>
-    <string name="live_task_info_msg1">After the broadcast, all anchors can get a series of tasks of the day. After completing the tasks according to the corresponding requirements, anchors can get the task reward of the previous day after the broadcast of the next day.</string>
-    <string name="live_task_info_msg2">● All task values will be calculated by the system in real time. If data errors occur due to personal, mobile, computer equipment problems, network problems or no normal downcasting, relevant anchors can contact relevant platform staff or online customer service for feedback. After confirmation by relevant part, compensation will be processed.\n● The normal settlement period of all mission data will be settled at 6:00 am every day. If the broadcast time is longer than 6:00 AM, the reward cannot be settled normally, please be noted.\n● When the anchor standard score is lower than 90, the anchor task center can only get 50% of all rewards. When the anchor standard score is lower than 80, the anchor task reward cannot be obtained.</string>
-    <string name="live_task_item_complete_true">success</string>
-    <string name="live_task_item_complete_false">incomplete</string>
-    <string name="live_task_item_hot">hot</string>
-    <string name="live_task_item_xp">exp</string>
-    <string name="live_data_msg1">This live data statistics</string>
-    <string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
-    <string name="live_data_tip">* Non-real-time calculation of data</string>
-
-    <string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
-    <string name="buy_guard_back_coin" >return</string>
-    <string name="praise">Like</string>
-    <string name="live_gift_buy_gold" >Open aristocracy</string>
-    <string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
-    <string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>
-    <string name="fingers_slide" >Swipe up to cancel send</string>
-    <string name="release_cancel_send" >Release cancel send</string>
-    <string name="more_than" >No recording has been recognized in over 10 seconds</string>
-    <string name="live_role_title" >Identity privilege</string>
-    <string name="noble_seat" >VIP seats</string>
-    <string name="live_mic_user_apply" >%s Applies for connected wheat. Check whether</string>
-    <string name="live_mic_user_down" >The wheat has been kicked off</string>
-    <string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
-    <string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>
-    <string name="random_pk_info_view_title" >Random PK</string>
-    <string name="random_pk_info_title" >PK main rules:</string>
-    <string name="random_pk_info_time_desc" >Random PK qualifying time</string>
-    <string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
-    <string name="random_pk_info_desc_1" >1. After matching, the system will automatically select opponents for PK;</string>
-    <string name="random_pk_info_desc_2" >2. If you cannot match your opponent for a long time, you can try to match again；</string>
-    <string name="random_pk_info_desc_3" >3. During the PK process, if there is any delay or delay, please check your personal device and network first, and then try to log in again and start broadcasting.</string>
-    <string name="random_pk_info_desc_4" >4, the security department will be 24 hours of inspection, please civilized PK, strictly abide by the anchor rules;</string>
-    <string name="random_pk_info_switch" >Random PK switch:</string>
-    <string name="random_pk_info_btn_start" >Start matching</string>
-    <string name="random_pk_info_btn_ing" >Match %s</string>
-    <string name="random_pk_info_btn_ing_desc" >Click again to cancel the match</string>
-    <string name="random_pk_info_btn_end" >Exiting match %s</string>
-    <string name="random_pk_info_btn_end_desc" >It\'s also possible to match an opponent during the exit process</string>
-    <string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
-    <string name="free_pk_user_pking" >The other team is engaged in a PK</string>
-    <string name="free_pk_num_null" >The PK number is used up</string>
-    <string name="live_user_mailbox_top_text">Letter from %s</string>
-    <string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
-    <string name="live_user_mailbox_more_text">View details</string>
-    <string name="live_user_mailbox_web_title">Letter from[%s]</string>
-    <string name="live_anchor_edit_call_me_title">Editors Contact</string>
-    <string name="live_anchor_edit_call_me_switch">Contact switch</string>
-    <string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
-    <string name="live_anchor_edit_call_me_not_filled">Not filled</string>
-    <string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
-    <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
-    <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
-    <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
-    <string name="live_ready_anchor_call_me">Contact</string>
-    <string name="live_anchor_say_title">Editors Goddess says</string>
-    <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
-    <string name="live_anchor_say_select_style">Select Style</string>
-    <string name="live_anchor_say_switch">The Goddess Says Switch</string>
-    <string name="live_user_letter_dialog_title">Delete Mail</string>
-    <string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
-    <string name="live_user_letter_dialog_yes">Delete</string>
-    <string name="live_user_letter_dialog_no">Think again</string>
-    <string name="dialog_live_mailbox_title">Letter</string>
-    <string name="live_anchor_edit_call_me_not_call_info_toash">Please turn on at least one contact information</string>
-    <string name="minute">Minute</string>
-    <string name="live_setting_silence_title">Please select</string>
-    <string name="live_ban_tip">You have been banned</string>
-    <string name="live_details_send_gift_btn">Confirm</string>
-    <string name="live_details_sned_gift_text1">Give</string>
-    <string name="live_details_sned_gift_text2">obtain the</string>
-    <string name="live_details_sned_gift_text3">\'s letter and contact information</string>
-    <string name="me_edit_avatar_title">Select Avatar</string>
-    <string name="me_edit_avatar_submit">Confirm</string>
-    <string name="live_fans_group_info_text1">1 The fan exclusive gift pack is an exclusive benefit for fan group users, which can quickly increase their companionship with the host after purchase</string>
-    <string name="live_fans_group_info_text2">2 After the gift pack is successfully purchased, the gift will be sent to [Fan Exclusive Gift Pack - Gift Pack], you can view and use it in [Gift Pack]; the avatar frame will be sent to [My - Personalized Dressing], you can use it in [Personalized Dressing] View and use in</string>
-    <string name="live_fans_group_info_text3">3 The exclusive gift package is bound to the anchor in a one-on-one relationship, and purchasing gift resources in the exclusive gift package can only be given to the anchor</string>
-    <string name="live_fans_group_info_text4">4 The gift resources in the gift package are valid for 30 days and can be given normally during the validity period; Gift resources become invalid and cannot be given after expiration</string>
-    <string name="live_fans_group_info2_text1">1 Purchase can only be made once a month, and the gift package will be distributed in real-time after purchase</string>
-    <string name="live_fans_group_info2_text2">2. The final interpretation rights of this gift package belong to PD Live</string>
-    <string name="live_fans_group_info_title">Introduction</string>
-    <string name="live_fans_group_info2_title">Rules</string>
-    <string name="live_fans_follow_toast">Join the fan group and unlock exclusive gifts</string>
-    <string name="live_fans_group_send_sub">Gift</string>
-    <string name="live_fans_group_send_title">Currently Available To Send</string>
-    <string name="live_fans_group_buy_title">The %s</string>
-    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
-    <string name="live_fans_group_buy_buy">%s Diamond</string>
-    <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
-    <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
-    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
-    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
-    <string name="message_chat_msg_all">Chat All</string>
-    <string name="message_chat_msg_all_an_a">Chat All</string>
-    <string name="message_chat_msg_recommend">Suggest chat</string>
-    <string name="message_chat_msg_system">System matching</string>
-    <string name="message_chat_msg_user">User initiated</string>
-    <string name="message_chat_msg_look_live">看直播%dmin</string>
-    <string name="message_chat_msg_read_tip">[Read]</string>
-    <string name="message_chat_msg_unread_tip">[Unread]</string>
-    <string name="message_interactive_chat">Initiate a chat</string>
-
-    <string name="prank_progress">Progress</string>
-    <string name="turntable_prank">To do</string>
-    <string name="details">Details></string>
-    <string name="combo_vote">Combo</string>
-    <string name="combo_vote_more">Most first</string>
-    <string name="live_prank_dialog_save">Save</string>
-    <string name="live_prank_dialog_clear">Clear</string>
-    <string name="live_prank_dialog_gift_type_number">highest combo</string>
-    <string name="live_prank_gift_add_title">Add gift</string>
-    <string name="live_prank_gift_add_gift">Gift</string>
-    <string name="live_prank_gift_add_gift_select">Choose a gift</string>
-    <string name="live_prank_gift_add_gift_number">Quantity</string>
-    <string name="live_prank_gift_add_gift_number_select">Fill in the number</string>
-    <string name="live_prank_gift_add_gift_content">Content</string>
-    <string name="live_prank_gift_add_gift_contnet_select">Please enter prank content, such as a dance.</string>
-    <string name="alive_prank_gift_add_gift_content_sub">confirm</string>
-    <string name="alive_prank_gift_dialog_number_title">Quantity</string>
-    <string name="live_prank_gift_dialog_number_btn">+ Set other quantity (up to 9999)</string>
-    <string name="alive_prank_gift_dialog_explain">Trick instructions</string>
-    <string name="prank_open_live_msg">Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room!</string>
-    <string name="prank_im_immediately_go">Go now</string>
-
-    <string name="live_prank_dialog_gift_type_todo">Switch to</string>
-    <string name="live_prank_switch">gift trick switch</string>
-    <string name="live_prank_switch_info">After closing, the user cannot see the gift trick</string>
-    <string name="live_prank_add_gift">+ Add gift trick</string>
-    <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
-
-    <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
-    <string name="live_room_sud_hint_join">Join</string>
-    <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
-</resources>
\ No newline at end of file
diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml
index 04f92fff9..0cbab987e 100644
--- a/live/src/main/res/values-zh/strings.xml
+++ b/live/src/main/res/values-zh/strings.xml
@@ -145,4 +145,15 @@
     <string name="prank_im_immediately_go">立即前往</string>
     <string name="live_room_sud_hint_join">加入</string>
     <string name="live_dialog_top_guardian_tasks">守護任務</string>
+
+    <string name="message_chat_msg_all">全部聊天</string>
+    <string name="message_chat_msg_all_an_a">全部聊天</string>
+    <string name="message_chat_msg_recommend">推荐聊天</string>
+    <string name="message_chat_msg_system">系統匹配</string>
+    <string name="message_chat_msg_user">對方主動</string>
+    <string name="message_chat_msg_look_live">看直播%dmin</string>
+    <string name="message_chat_msg_read_tip">[已讀]</string>
+    <string name="message_chat_msg_unread_tip">[未讀]</string>
+    <string name="message_interactive_chat">發起聊天</string>
+
 </resources>
diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
index fe8482ff1..e4776463c 100644
--- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
@@ -46,6 +46,7 @@ import com.yunbao.common.bean.ActiveBean;
 import com.yunbao.common.bean.ActiveOtherBean;
 import com.yunbao.common.bean.HomeUserExhibitInfoBean;
 import com.yunbao.common.bean.HomeUserInfoBean;
+import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LabelBean;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.NewLevelModel;
@@ -59,6 +60,7 @@ import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.CommonCallback;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.upload.UploadBean;
 import com.yunbao.common.upload.UploadCallback;
@@ -803,7 +805,7 @@ public class UserHomeActivity extends AbsActivity {
             @Override
             public void onClick(View v) {
                 Constants.myIntoIndex = 2;
-                String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/RongYuQiang??touid=" + uid;
+                String url = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/RongYuQiang?touid=" + uid+"&isZh="+(WordUtil.isNewZh() ? "1" : "0");
                 WebViewActivity.forward(mContext, url, false);
             }
         });
diff --git a/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java b/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
index 37192a33e..893b8df5b 100644
--- a/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
+++ b/main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
@@ -175,7 +175,7 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
                 String[] permissions;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     permissions = new String[]{
-                            Manifest.permission.READ_MEDIA_IMAGES,
+                            //Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限，到里面选择封面的时候再去申请
                             Manifest.permission.CAMERA,
                             Manifest.permission.RECORD_AUDIO
                     };
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
index 81304ff53..1fe92a305 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
@@ -470,8 +470,11 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                     } else if ("home_page_banner_battle".equals(link)) {
                                         RouteUtil.forwardBattlePass();
                                     } else if ("home_page_banner_giftwall".equals(link)) {
+                                        if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) {
+                                            mShowLoadingDialog.dismiss();
+                                        }
                                         new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
-                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
+                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
                                                 , false).setFullWindows(true).setTab2(true).showDialog();
                                     } else {
                                         gotoLive(link);
diff --git a/main/src/main/res/layout/dialog_message_status_config.xml b/main/src/main/res/layout/dialog_message_status_config.xml
index bdadca5f7..dc62aa917 100644
--- a/main/src/main/res/layout/dialog_message_status_config.xml
+++ b/main/src/main/res/layout/dialog_message_status_config.xml
@@ -23,7 +23,6 @@
             android:background="@drawable/view_btn_chat_status_config"
             android:bufferType="spannable"
             android:button="@null"
-            android:checked="true"
             android:drawableTop="@drawable/view_btn_chat_status_config_online_color"
             android:ellipsize="marquee"
             android:gravity="center"
@@ -39,7 +38,6 @@
             android:layout_height="100dp"
             android:background="@drawable/view_btn_chat_status_config"
             android:button="@null"
-            android:checked="false"
             android:drawableTop="@drawable/view_btn_chat_status_config_off_color"
             android:gravity="center"
             android:paddingTop="30dp"
diff --git a/main/src/main/res/mipmap-b+en+us/ic_chat_auth.png b/main/src/main/res/mipmap-b+en+us/ic_chat_auth.png
deleted file mode 100644
index f99da0624..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_chat_auth.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_normal.png b/main/src/main/res/mipmap-b+en+us/ic_reward_tab_normal.png
deleted file mode 100644
index 5c2bce771..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_normal.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate.png b/main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate.png
deleted file mode 100644
index aaf7103eb..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate_unselect.png b/main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate_unselect.png
deleted file mode 100644
index 0cec8a7e4..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_ultimate_unselect.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade.png b/main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade.png
deleted file mode 100644
index 30ba86e3d..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade_unselect.png b/main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade_unselect.png
deleted file mode 100644
index 6449041c3..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_reward_tab_upgrade_unselect.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_battlepass_reward_item_received.png b/main/src/main/res/mipmap-b+en+us/ic_zl_battlepass_reward_item_received.png
deleted file mode 100644
index b3b4b4f0e..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_battlepass_reward_item_received.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_tab1.png b/main/src/main/res/mipmap-b+en+us/ic_zl_tab1.png
deleted file mode 100644
index 1035b8933..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_tab1.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_tab1_unselect.png b/main/src/main/res/mipmap-b+en+us/ic_zl_tab1_unselect.png
deleted file mode 100644
index d05fbb770..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_tab1_unselect.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_tab2.png b/main/src/main/res/mipmap-b+en+us/ic_zl_tab2.png
deleted file mode 100644
index 1efa67759..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_tab2.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_tab2_unselect.png b/main/src/main/res/mipmap-b+en+us/ic_zl_tab2_unselect.png
deleted file mode 100644
index 4755ba57c..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_tab2_unselect.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_tab3.png b/main/src/main/res/mipmap-b+en+us/ic_zl_tab3.png
deleted file mode 100644
index a37598748..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_tab3.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/ic_zl_tab3_unselect.png b/main/src/main/res/mipmap-b+en+us/ic_zl_tab3_unselect.png
deleted file mode 100644
index 866c95b5d..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/ic_zl_tab3_unselect.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/icon_bp_flot.png b/main/src/main/res/mipmap-b+en+us/icon_bp_flot.png
deleted file mode 100644
index 3baeca99e..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/icon_bp_flot.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/icon_main_live_type_1.png b/main/src/main/res/mipmap-b+en+us/icon_main_live_type_1.png
deleted file mode 100644
index efcc58227..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/icon_main_live_type_1.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/icon_user_home_living.gif b/main/src/main/res/mipmap-b+en+us/icon_user_home_living.gif
deleted file mode 100644
index 0dd148bff..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/icon_user_home_living.gif and /dev/null differ
diff --git a/main/src/main/res/mipmap-b+en+us/zl_user_pass.png b/main/src/main/res/mipmap-b+en+us/zl_user_pass.png
deleted file mode 100644
index b32b502b3..000000000
Binary files a/main/src/main/res/mipmap-b+en+us/zl_user_pass.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-mdpi/multiplayerpk.png b/main/src/main/res/mipmap-mdpi/multiplayerpk.png
deleted file mode 100644
index 8bd8fdb4c..000000000
Binary files a/main/src/main/res/mipmap-mdpi/multiplayerpk.png and /dev/null differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_chat_auth.png b/main/src/main/res/mipmap-xxhdpi/ic_chat_auth.png
index 8644015f2..f99da0624 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_chat_auth.png and b/main/src/main/res/mipmap-xxhdpi/ic_chat_auth.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_normal.png b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_normal.png
index 85fb5c7ee..5c2bce771 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_normal.png and b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_normal.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate.png b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate.png
index b1483cf11..aaf7103eb 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate.png and b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate_unselect.png b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate_unselect.png
index 46a94a846..0cec8a7e4 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate_unselect.png and b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_ultimate_unselect.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade.png b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade.png
index e2dc47220..e69de29bb 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade.png and b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade_unselect.png b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade_unselect.png
index f683911b5..e69de29bb 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade_unselect.png and b/main/src/main/res/mipmap-xxhdpi/ic_reward_tab_upgrade_unselect.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_battlepass_reward_item_received.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_battlepass_reward_item_received.png
index 5f5f47de4..b3b4b4f0e 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_battlepass_reward_item_received.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_battlepass_reward_item_received.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1.png
index fc518783a..1035b8933 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1_unselect.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1_unselect.png
index 239c277ab..d05fbb770 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1_unselect.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab1_unselect.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2.png
index 41fbb7199..1efa67759 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2_unselect.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2_unselect.png
index e5901ad92..4755ba57c 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2_unselect.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab2_unselect.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3.png
index f719685ec..a37598748 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3_unselect.png b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3_unselect.png
index d52abc6e5..866c95b5d 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3_unselect.png and b/main/src/main/res/mipmap-xxhdpi/ic_zl_tab3_unselect.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/icon_bp_flot.png b/main/src/main/res/mipmap-xxhdpi/icon_bp_flot.png
index 6bacf9a24..3baeca99e 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/icon_bp_flot.png and b/main/src/main/res/mipmap-xxhdpi/icon_bp_flot.png differ
diff --git a/main/src/main/res/mipmap-b+en+us/multiplayerpk.png b/main/src/main/res/mipmap-xxhdpi/multiplayerpk.png
similarity index 100%
rename from main/src/main/res/mipmap-b+en+us/multiplayerpk.png
rename to main/src/main/res/mipmap-xxhdpi/multiplayerpk.png
diff --git a/main/src/main/res/mipmap-xxhdpi/zl_user_pass.png b/main/src/main/res/mipmap-xxhdpi/zl_user_pass.png
index 1a13d2caa..b32b502b3 100644
Binary files a/main/src/main/res/mipmap-xxhdpi/zl_user_pass.png and b/main/src/main/res/mipmap-xxhdpi/zl_user_pass.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_chat_auth.png b/main/src/main/res/mipmap-zh/ic_chat_auth.png
new file mode 100644
index 000000000..8644015f2
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_chat_auth.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_reward_tab_normal.png b/main/src/main/res/mipmap-zh/ic_reward_tab_normal.png
new file mode 100644
index 000000000..85fb5c7ee
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_reward_tab_normal.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_reward_tab_ultimate.png b/main/src/main/res/mipmap-zh/ic_reward_tab_ultimate.png
new file mode 100644
index 000000000..b1483cf11
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_reward_tab_ultimate.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_reward_tab_ultimate_unselect.png b/main/src/main/res/mipmap-zh/ic_reward_tab_ultimate_unselect.png
new file mode 100644
index 000000000..46a94a846
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_reward_tab_ultimate_unselect.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_reward_tab_upgrade.png b/main/src/main/res/mipmap-zh/ic_reward_tab_upgrade.png
new file mode 100644
index 000000000..e2dc47220
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_reward_tab_upgrade.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_reward_tab_upgrade_unselect.png b/main/src/main/res/mipmap-zh/ic_reward_tab_upgrade_unselect.png
new file mode 100644
index 000000000..f683911b5
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_reward_tab_upgrade_unselect.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_battlepass_reward_item_received.png b/main/src/main/res/mipmap-zh/ic_zl_battlepass_reward_item_received.png
new file mode 100644
index 000000000..5f5f47de4
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_battlepass_reward_item_received.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_tab1.png b/main/src/main/res/mipmap-zh/ic_zl_tab1.png
new file mode 100644
index 000000000..fc518783a
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_tab1.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_tab1_unselect.png b/main/src/main/res/mipmap-zh/ic_zl_tab1_unselect.png
new file mode 100644
index 000000000..239c277ab
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_tab1_unselect.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_tab2.png b/main/src/main/res/mipmap-zh/ic_zl_tab2.png
new file mode 100644
index 000000000..41fbb7199
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_tab2.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_tab2_unselect.png b/main/src/main/res/mipmap-zh/ic_zl_tab2_unselect.png
new file mode 100644
index 000000000..e5901ad92
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_tab2_unselect.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_tab3.png b/main/src/main/res/mipmap-zh/ic_zl_tab3.png
new file mode 100644
index 000000000..f719685ec
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_tab3.png differ
diff --git a/main/src/main/res/mipmap-zh/ic_zl_tab3_unselect.png b/main/src/main/res/mipmap-zh/ic_zl_tab3_unselect.png
new file mode 100644
index 000000000..d52abc6e5
Binary files /dev/null and b/main/src/main/res/mipmap-zh/ic_zl_tab3_unselect.png differ
diff --git a/main/src/main/res/mipmap-zh/icon_bp_flot.png b/main/src/main/res/mipmap-zh/icon_bp_flot.png
new file mode 100644
index 000000000..6bacf9a24
Binary files /dev/null and b/main/src/main/res/mipmap-zh/icon_bp_flot.png differ
diff --git a/live/src/main/res/mipmap-xhdpi/multiplayerpk.png b/main/src/main/res/mipmap-zh/multiplayerpk.png
similarity index 100%
rename from live/src/main/res/mipmap-xhdpi/multiplayerpk.png
rename to main/src/main/res/mipmap-zh/multiplayerpk.png
diff --git a/main/src/main/res/mipmap-zh/zl_user_pass.png b/main/src/main/res/mipmap-zh/zl_user_pass.png
new file mode 100644
index 000000000..1a13d2caa
Binary files /dev/null and b/main/src/main/res/mipmap-zh/zl_user_pass.png differ