diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
index c67eca820..2f6210007 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
@@ -1316,8 +1316,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     private fun addOpenDatingTips() {
         if (AvRoomDataManager.get().isDatingMode && !isDatingMode && AvRoomDataManager.get().isManager) {
             val tipMessage =
-                ChatRoomMessageBuilder.createTipMessage(XConstants.DATING_TIPS_OPEN)
-            tipMessage.content = XConstants.DATING_TIPS_OPEN
+                ChatRoomMessageBuilder.createTipMessage(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_09))
+            tipMessage.content = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_09)
             IMNetEaseManager.get().addMessages(tipMessage)
         }
     }
diff --git a/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java b/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java
index 2004d2de0..3cc353894 100644
--- a/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java
+++ b/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java
@@ -856,7 +856,7 @@ public class PublicChatMessageView extends FrameLayout {
                 }
             } else {
                 String content = chatRoomMessage.getContent();
-                if (!TextUtils.isEmpty(content) && content.equals(XConstants.ROOM_INTRODUCTION))
+                if (!TextUtils.isEmpty(content) && content.equals(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_08)))
                     if (onClick != null) {
                         onClick.onShowRoomIntroduction();
                     }
diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
index 4ee647c1a..836e9f5b1 100644
--- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
@@ -661,13 +661,13 @@ public class MessageView extends FrameLayout {
                     // 房間通告
                     if (ResUtil.getString(R.string.avroom_widget_messageview_03).equals(contentText)) {
                         setUpdateGiftEffectMsg(tvContent);
-                    } else if (XConstants.ROOM_INTRODUCTION.equals(contentText) || contentText.contains(IMNetEaseManager.ROOM_INTRO_TAG)) {
+                    } else if (ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_08).equals(contentText) || contentText.contains(IMNetEaseManager.ROOM_INTRO_TAG)) {
                         tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.white));
                         tvContent.setText(contentText);
-                    } else if (XConstants.DATING_TIPS_OPEN.equals(contentText) ||
-                            contentText.contains(XConstants.DATING_TIPS_IN) ||
-                            contentText.contains(XConstants.DATING_TIPS_NEW) ||
-                            contentText.contains(XConstants.DATING_TIPS_PUBLIC)) {
+                    } else if (ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_09).equals(contentText) ||
+                            contentText.contains(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_011)) ||
+                            contentText.contains(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_010)) ||
+                            contentText.contains(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_012))) {
                         //相親模式提示文案用特殊的顏色
                         tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_fe5d7f));
                         tvContent.setText(contentText);
@@ -2942,7 +2942,7 @@ public class MessageView extends FrameLayout {
                 }
             } else {
                 String content = chatRoomMessage.getContent();
-                if (!TextUtils.isEmpty(content) && content.equals(XConstants.ROOM_INTRODUCTION))
+                if (!TextUtils.isEmpty(content) && content.equals(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_08)))
                     if (onClick != null) {
                         onClick.onShowRoomIntroduction();
                     }
diff --git a/app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java
index b271d1317..d11007b14 100644
--- a/app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java
+++ b/app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java
@@ -146,7 +146,7 @@ public class ChargeBillsActivity extends BillBaseActivity<ActivityBillsBinding>
                 adapter.addData(billItemEntities);
             } else {
                 if (mCurrentCounter == Constants.PAGE_START) {
-                    showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
+                    showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_017));
                 } else {
                    adapter.loadMoreEnd(true);
                 }
diff --git a/app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java
index f2538a54b..3011f2932 100644
--- a/app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java
+++ b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java
@@ -20,6 +20,7 @@ import com.chwl.core.bills.bean.IncomeInfo;
 import com.chwl.core.bills.bean.IncomeListInfo;
 import com.chwl.library.base.factory.CreatePresenter;
 import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -124,7 +125,7 @@ public class GiftIncomeFragment extends BaseBillsFragment<IGiftIncomeView, GiftI
                 adapter.addData(billItemEntities);
             } else {
                 if (mCurrentCounter == Constants.PAGE_START) {
-                    showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
+                    showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_017));
                 } else {
                     adapter.loadMoreEnd(true);
                 }
diff --git a/app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java
index 7e925e0de..c15285b50 100644
--- a/app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java
+++ b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java
@@ -20,6 +20,7 @@ import com.chwl.core.bills.bean.ExpendInfo;
 import com.chwl.core.bills.bean.ExpendListInfo;
 import com.chwl.library.base.factory.CreatePresenter;
 import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -125,7 +126,7 @@ public class GiftOutputFragment extends BaseBillsFragment<IGiftOutputView, GiftO
                 adapter.addData(billItemEntities);
             } else {
                 if (mCurrentCounter == Constants.PAGE_START) {
-                    showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
+                    showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_017));
                 } else {
                     adapter.loadMoreEnd(true);
                 }
diff --git a/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java
index 1029dc83b..0228a3976 100644
--- a/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java
+++ b/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java
@@ -27,6 +27,7 @@ import com.chwl.core.bills.bean.IncomeInfo;
 import com.chwl.core.bills.bean.IncomeListInfo;
 import com.chwl.library.annatation.ActLayoutRes;
 import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -157,7 +158,7 @@ public class WithdrawBillsFragment extends BaseBindingFragment<FragmentXrexylerv
                 adapter.addData(billItemEntities);
             } else {
                 if (mCurrentCounter == 1) {
-                    showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
+                    showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_017));
                 } else {
                     adapter.loadMoreEnd(true);
                 }
diff --git a/app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java b/app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java
index adb88cf14..a4db4f31b 100644
--- a/app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java
+++ b/app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java
@@ -27,6 +27,7 @@ import com.chwl.core.radish.task.bean.TaskInfo;
 import com.chwl.core.utils.net.DontWarnObserver;
 import com.chwl.core.utils.net.RxHelper;
 import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 import com.chwl.library.utils.SingleToastUtil;
 
 @CreatePresenter(TaskCenterFrgPresenter.class)
@@ -85,7 +86,7 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
                 }
                 final TaskInfo item = info;
                 if (!item.isSupport()) {
-                    SingleToastUtil.showToast(XConstants.UPDATE_VERSION_TIPS);
+                    SingleToastUtil.showToast(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_013));
                     return;
                 }
                 if (item.getStatus() == TaskInfo.STATUS_FINISHED_NOT_RECEIVE) {
@@ -115,7 +116,7 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
                     if (item.getSkipType() == TaskInfo.SHIP_TYPE_APP) {
                         boolean result = RouterHandler.handle(mContext, item.getRouterType(), item.getRouterValue());
                         if (!result) {
-                            SingleToastUtil.showToast(XConstants.UPDATE_VERSION_TIPS);
+                            SingleToastUtil.showToast(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_013));
                             return;
                         }
 
@@ -127,7 +128,7 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
                         record = true;
 
                     } else
-                        SingleToastUtil.showToast(XConstants.UPDATE_VERSION_TIPS);
+                        SingleToastUtil.showToast(ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_013));
 
                     if (record) {
 
diff --git a/core/src/main/java/com/chwl/core/XConstants.java b/core/src/main/java/com/chwl/core/XConstants.java
index 65a321c3e..27fbcc9d6 100644
--- a/core/src/main/java/com/chwl/core/XConstants.java
+++ b/core/src/main/java/com/chwl/core/XConstants.java
@@ -1,6 +1,5 @@
 package com.chwl.core;
 
-import com.chwl.library.utils.ResUtil;
 
 /**
  * Created by MadisonRong on 09/08/2018.
@@ -53,29 +52,9 @@ public class XConstants {
      * 賽事消息UID
      */
     public static final String MATCH_UID = BuildConfig.DEBUG ? "1296314" : "904772";
-
-    public static final String ROOM_INTRODUCTION = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_08);
-
-    public static final String DATING_TIPS_OPEN = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_09);
-    //僅開頭提示文案,這個tips消息我們服務端發的
-    public static final String DATING_TIPS_NEW = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_010);
-    public static final String DATING_TIPS_IN = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_011);
-    public static final String DATING_TIPS_PUBLIC = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_012);
-
     public static final String SHOW = "show";
     public static final String HIDE = "hide";
 
-    public static final String UPDATE_VERSION_TIPS = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_013);
-
-    public static final String NET_ERROR = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_014);
-
-    public static final String UNKOWN_ERROR = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_015);
-
-    /**
-     * 當布局記錄為空時的提示，比如禮物，充值
-     */
-    public static final String EMPTY_RECORD_AND_THREE_MONTHS_TIPSS = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_017);
-
     // 舉報入口標識
     public static final String REPORT_TYPE_CHAT = "chat"; // 私聊
     public static final String REPORT_TYPE_PERSONAL = "personal"; // 個人中心
diff --git a/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
index c6f50d79e..db6612914 100644
--- a/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
+++ b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
@@ -2907,7 +2907,7 @@ public final class IMNetEaseManager {
                             public Publisher<?> apply(Throwable throwable) throws Exception {
                                 String error = throwable.getMessage();
                                 if (TextUtils.isEmpty(error)) {
-                                    error = XConstants.UNKOWN_ERROR;
+                                    error = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_015);
                                 }
                                 if (listener != null) {
                                     listener.onFailed(retryChatRoomMessage.getRetryCount(), error);
@@ -3640,7 +3640,7 @@ public final class IMNetEaseManager {
                     addMessagesImmediately(message);
                 }
 
-                content = XConstants.ROOM_INTRODUCTION;
+                content = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_08);
                 message = ChatRoomMessageBuilder.createTipMessage(content);
                 message.setContent(content);
                 addMessagesImmediately(message);
diff --git a/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java b/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
index 2e138166c..8533f5342 100644
--- a/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
+++ b/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
@@ -2,7 +2,9 @@ package com.chwl.core.utils.net;
 
 import android.text.TextUtils;
 
+import com.chwl.core.R;
 import com.chwl.core.XConstants;
+import com.chwl.library.utils.ResUtil;
 
 import java.net.UnknownHostException;
 
@@ -41,10 +43,10 @@ public abstract class DontWarnObserver<T> implements SingleObserver<T> {
             error = e.getMessage();
         }
         if (e instanceof UnknownHostException) {
-            error = XConstants.NET_ERROR;
+            error = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_014);
         }
         if (TextUtils.isEmpty(error)) {
-            error = XConstants.NET_ERROR;
+            error = ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_014);
         }
         accept(null, error);
         acceptThrowable(null, e);