diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index 90c2b2e92..5c11854c3 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -162,6 +162,7 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.message.CallVideoActivity"
+            android:hardwareAccelerated="true"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.message.CallAudioActivity"
@@ -171,6 +172,7 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.EndCallActivity"
+            android:launchMode="singleInstance"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.MyFriendListActivity"
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java b/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
index 68f79f107..0df103577 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
@@ -96,9 +96,8 @@ public class AppContext extends CommonAppContext {
         RongConfigCenter.conversationConfig().addMessageProvider(new MessageChatReceiveGiftItemProvider(getApplicationContext()));
         RongConfigCenter.conversationConfig().addMessageProvider(new MessageChatAutoItemProvider(getApplicationContext()));
 
-        String appKey = "lmxuhwagl7s1d";
-        boolean enablePush = true;
-        RongIM.init(this, appKey, enablePush);
+        RongcloudIMManager.initRongIM(this);
+
         RongIM.setConnectionStatusListener(new RongIMClient.ConnectionStatusListener() {
             @Override
             public void onChanged(ConnectionStatus status) {
@@ -107,7 +106,7 @@ public class AppContext extends CommonAppContext {
         });
 
 
-        RongcloudIMManager.initRongIM(this);
+
         RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {
             @Override
             public boolean onReceived(Message message, int left, boolean hasPackage, boolean offline) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
index eb4b96ebf..6dd5a7325 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
@@ -20,6 +20,7 @@ import com.shayu.onetoone.activity.fragments.DynamicFragment;
 import com.shayu.onetoone.activity.fragments.FriendsFragment;
 import com.shayu.onetoone.activity.fragments.MessageFragment;
 import com.shayu.onetoone.activity.fragments.MyFragment;
+import com.shayu.onetoone.activity.message.ChatActivity;
 import com.shayu.onetoone.bean.JoinAnchorBean;
 import com.shayu.onetoone.bean.MatchingItemSizeBean;
 import com.shayu.onetoone.bean.OfficialNoticeBean;
@@ -127,7 +128,6 @@ public class MainActivity extends AbsOTOActivity {
             }
         });
         CallClientManager.getManager();
-        initFirstLoginTips();
     }
 
     private void initFirstLoginTips() {
@@ -141,16 +141,18 @@ public class MainActivity extends AbsOTOActivity {
                         boolean isShow = true;
                         if (data.getLogin() == 0) {
                             isHome = true;
-                        } else if (data.getChat() == 0) {
+                        }
+                        if (data.getChat() == 0) {
                             isMan = IMLoginManager.get(mContext).getUserInfo().getSex() == 1;
-                        } else {
+                        }
+                        if (!isHome && data.getChat() != 0) {
                             isShow = false;
                         }
                         Bus.get().post(new HomeBusEvent(HomeBusEvent.TYPE_UPDATE_MATCHING, data.getNum()));
                         if (isShow) {
                             new FirstTipsDialog(mContext)
-                                    .setHome(isMan)
-                                    .setMan(isHome)
+                                    .setHome(isHome)
+                                    .setMan(isMan)
                                     .setOnItemClickListener(new OnItemClickListener<FirstTipsDialog>() {
                                         @Override
                                         public void onItemClick(FirstTipsDialog dialog, int position) {
@@ -160,6 +162,7 @@ public class MainActivity extends AbsOTOActivity {
                                                     public void onSuccess(String token, SendConsumeBean bean) {
                                                         super.onSuccess(token, bean);
                                                         Bundle bundle = new Bundle();
+                                                        bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_MATCH);
                                                         bundle.putString("data", JSONObject.toJSONString(bean));
                                                         RouteManager.forwardActivity(RouteManager.ACTIVITY_MATCHING, bundle);
                                                     }
@@ -170,8 +173,10 @@ public class MainActivity extends AbsOTOActivity {
                                                         RouteManager.forwardActivity(RouteManager.ACTIVITY_MATCHING);
                                                     }
                                                 });
+                                                OTONetManager.getInstance(mContext).setFiled("is_login","1",null);
                                             } else {
                                                 viewPager.setCurrentItem(2);
+                                                OTONetManager.getInstance(mContext).setFiled("is_chat","1",null);
                                             }
                                             dialog.dismiss();
                                         }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
index c3e9ff3a3..1a434aca6 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import com.alibaba.fastjson.JSONObject;
 import com.shayu.onetoone.R;
 import com.shayu.onetoone.activity.fragments.BaseFragment;
+import com.shayu.onetoone.activity.message.ChatActivity;
 import com.shayu.onetoone.adapter.HomeRecommendListAdapter;
 import com.shayu.onetoone.bean.HomeItemBean;
 import com.shayu.onetoone.bean.MatchingItemSizeBean;
@@ -90,6 +91,7 @@ public class RecommendFragment extends BaseFragment {
                 public void onSuccess(String token, SendConsumeBean bean) {
                     super.onSuccess(token, bean);
                     Bundle bundle = new Bundle();
+                    bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_MATCH);
                     bundle.putString("data", JSONObject.toJSONString(bean));
                     RouteManager.forwardActivity(RouteManager.ACTIVITY_MATCHING, bundle);
                 }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
index 53e5ac5b8..f6b40df1a 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
@@ -237,6 +237,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
 
             video.setOnClickListener(v -> {
                 if (call.getTag() != null) {
+                    ToastUtil.show(R.string.toast_call_not_unlock);
                     return;
                 }
                 checkAuth(new OnSendMessageListener() {
@@ -262,14 +263,14 @@ public class ChatMessageFragment extends AbsConversationFragment {
                                                 super.onError(status, msg);
                                                 new TipsDialog(mContext)
                                                         .setTitle(WordUtil.getNewString(R.string.not_money))
-                                                        .setContent(String.format(WordUtil.getNewString(R.string.not_money_video_tips),configBean.getVideoPrice()))
+                                                        .setContent(String.format(WordUtil.getNewString(R.string.not_money_video_tips), configBean.getVideoPrice()))
                                                         .setCancelText(WordUtil.getNewString(R.string.dialog_cancel_tip))
                                                         .setApplyText(WordUtil.getNewString(R.string.dialog_to_money_tip))
                                                         .showDialog();
                                             }
                                         });
                                     }
-                                }).setStrings(Collections.singletonList(String.format(WordUtil.getNewString(R.string.chat_video_tips),configBean.getVideoPrice())))
+                                }).setStrings(Collections.singletonList(String.format(WordUtil.getNewString(R.string.chat_video_tips), configBean.getVideoPrice())))
                                 .showDialog();
 
 
@@ -284,6 +285,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
             });
             call.setOnClickListener(v -> {
                 if (call.getTag() != null) {
+                    ToastUtil.show(R.string.toast_call_not_unlock);
                     return;
                 }
                 checkAuth(new OnSendMessageListener() {
@@ -309,7 +311,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
                                                 super.onError(status, msg);
                                                 new TipsDialog(mContext)
                                                         .setTitle(WordUtil.getNewString(R.string.not_money))
-                                                        .setContent(String.format(WordUtil.getNewString(R.string.not_money_audio_tips),configBean.getMp3Price()))
+                                                        .setContent(String.format(WordUtil.getNewString(R.string.not_money_audio_tips), configBean.getMp3Price()))
                                                         .setCancelText(WordUtil.getNewString(R.string.dialog_cancel_tip))
                                                         .setApplyText(WordUtil.getNewString(R.string.dialog_to_money_tip))
                                                         .showDialog();
@@ -317,7 +319,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
                                         });
 
                                     }
-                                }).setStrings(Collections.singletonList(String.format(WordUtil.getNewString(R.string.chat_audio_tips),configBean.getMp3Price())))
+                                }).setStrings(Collections.singletonList(String.format(WordUtil.getNewString(R.string.chat_audio_tips), configBean.getMp3Price())))
                                 .showDialog();
                     }
 
@@ -584,7 +586,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
         String[] list;
         if (isTextMessage) {
             if (isMy) {
-                list = new String[]{WordUtil.getNewString(R.string.copy),WordUtil.getNewString(R.string.delete)};
+                list = new String[]{WordUtil.getNewString(R.string.copy), WordUtil.getNewString(R.string.delete)};
             } else {
                 list = new String[]{WordUtil.getNewString(R.string.copy)};
             }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
index 0bde6aea0..cfd50301d 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
@@ -38,6 +38,7 @@ import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.RandomUtil;
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 
 import org.greenrobot.eventbus.Subscribe;
@@ -187,7 +188,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
                             mAdapter.add(setTopData(datum.getTitle(),
                                     datum.getContent(),
                                     datum.getAddtime() * 1000,
-                                    datum.getNew_image(),
+                                    datum.getImage(),
                                     datum.getNum(),
                                     datum.getType(),
                                     JSONObject.toJSONString(datum)
@@ -208,6 +209,9 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
     }
 
     private SingleConversation setTopData(String title, String content, long time, String avatar, int num, int id, String exp) {
+        if(StringUtil.isEmpty(content)){
+            content = "";
+        }
         SingleConversation conversation = new SingleConversation(getContext(), new Conversation());
         conversation.mCore.setConversationType(Conversation.ConversationType.PRIVATE);
         conversation.mCore.setSenderUserName(title);
@@ -218,6 +222,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
         conversation.mCore.setUnreadMessageCount(num);
         conversation.mCore.setTargetId(id + "");
         conversation.mCore.setLatestMessageExtra(exp);
+        conversation.mCore.setPortraitUrl(avatar);
         UserInfo info = new UserInfo(id + "", title, Uri.parse(avatar));
         JSONObject json = new JSONObject();
         json.put("sex", -1);
@@ -236,7 +241,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
      * 全部标记已读
      */
     public void allRead() {
-        clearTopData();
+     //   clearTopData();
         RongCoreClient.getInstance().getUnreadConversationList(new IRongCoreCallback.ResultCallback<List<Conversation>>() {
             @Override
             public void onSuccess(List<Conversation> conversations) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java
index a20730946..83b2733f2 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java
@@ -1,6 +1,7 @@
 package com.shayu.onetoone.activity.message;
 
 import android.app.Dialog;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -77,7 +78,7 @@ public class CallVideoActivity extends AbsOTOActivity {
     private String targetId;
     private String callId;
     private String model;
-
+    private SurfaceView localVideo, remoteVideo;
 
     @Override
     protected int getLayoutId() {
@@ -156,10 +157,31 @@ public class CallVideoActivity extends AbsOTOActivity {
     private void initView() {
         rootView = findViewById(R.id.rootView);
         myView = findViewById(R.id.my_view);
-        targetView = findViewById(R.id.target_view);
         callLayout = findViewById(R.id.rc_voip_two_btn);
         buttonView = LayoutInflater.from(mContext).inflate(R.layout.view_call_video_item, rootView, false);
         callWaitLayout = LayoutInflater.from(mContext).inflate(R.layout.view_call_video_wait, rootView, false);
+        targetView = buttonView.findViewById(R.id.target_view);
+        targetView.setTag(true);
+        targetView.setBackgroundColor(Color.YELLOW);
+        targetView.setOnClickListener(v -> {
+            ToastUtil.show("点击");
+            myView.removeAllViews();
+            targetView.removeAllViews();
+            if (targetView.getTag() == null) {
+                myView.addView(remoteVideo);
+                myView.addView(buttonView);
+                targetView.addView(localVideo);
+                targetView.setTag(true);
+            } else {
+                ImageView imageView=new ImageView(mContext);
+                imageView.setImageResource(R.mipmap.bg_message_msg_title_heartbeat);
+                myView.addView(localVideo);
+                myView.addView(buttonView);
+                targetView.addView(imageView);
+                targetView.setTag(null);
+            }
+
+        });
 
     }
 
@@ -193,7 +215,7 @@ public class CallVideoActivity extends AbsOTOActivity {
         // 为所有View设置点击事件监听器
         setClickListeners();
 
-        if(model.equals(CallClientManager.VIDEO_RECEIVED_CALL)){
+        if (model.equals(CallClientManager.VIDEO_RECEIVED_CALL)) {
             gift.setVisibility(View.INVISIBLE);
             money.setVisibility(View.INVISIBLE);
         }
@@ -243,7 +265,7 @@ public class CallVideoActivity extends AbsOTOActivity {
     }
 
     private void showWindow(boolean toChatView) {
-        if(!PermissionUtils.checkPermission(this)){
+        if (!PermissionUtils.checkPermission(this)) {
             new TipsDialog(mContext)
                     .setTitle(WordUtil.getNewString(R.string.permission_hint))
                     .setApplyText(WordUtil.getNewString(R.string.permission_setting))
@@ -255,7 +277,7 @@ public class CallVideoActivity extends AbsOTOActivity {
                             PermissionUtils.requestPermission(CallVideoActivity.this, new OnPermissionResult() {
                                 @Override
                                 public void permissionResult(boolean b) {
-                                    if(b){
+                                    if (b) {
                                         showWindow(toChatView);
                                     }
                                 }
@@ -397,7 +419,8 @@ public class CallVideoActivity extends AbsOTOActivity {
         @Override
         public void onCallWait(SurfaceView surfaceView) {
             myView.removeAllViews();
-            myView.addView(surfaceView);
+            localVideo = surfaceView;
+            myView.addView(localVideo);
             if (model.equals(CallClientManager.VIDEO_CALL)) {
                 myView.addView(callWaitLayout);
             }
@@ -416,8 +439,9 @@ public class CallVideoActivity extends AbsOTOActivity {
                 surfaceView.setZOrderMediaOverlay(false);
                 surfaceView.invalidate();
             });
+            remoteVideo = surfaceView;
             myView.removeAllViews();
-            myView.addView(surfaceView);
+            myView.addView(remoteVideo);
             targetView.removeAllViews();
             targetView.addView(CallClientManager.getManager().getLocalVideo());
             myView.addView(buttonView);
@@ -445,7 +469,7 @@ public class CallVideoActivity extends AbsOTOActivity {
         public void onTime(String time) {
             super.onTime(time);
             if (callTime != null) {
-                callTime.setText(WordUtil.getNewString(R.string.call_time)+""+ time);
+                callTime.setText(WordUtil.getNewString(R.string.call_time) + "" + time);
             }
         }
 
@@ -464,7 +488,7 @@ public class CallVideoActivity extends AbsOTOActivity {
         }
 
         void createShow(long msg) {
-            if(model.equals(CallClientManager.VIDEO_RECEIVED_CALL)){
+            if (model.equals(CallClientManager.VIDEO_RECEIVED_CALL)) {
                 return;
             }
             tipsDialog = new TipsTextDialog(mContext)
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
index c44d8f2f2..9cf423044 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
@@ -29,6 +29,7 @@ import com.shayu.onetoone.event.MessageMsgBusEvent;
 import com.shayu.onetoone.listener.OnDialogClickListener;
 import com.shayu.onetoone.manager.OTONetManager;
 import com.shayu.onetoone.manager.RouteManager;
+import com.shayu.onetoone.manager.SendMessageManager;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.utils.RouteUtil;
@@ -40,8 +41,13 @@ import org.greenrobot.eventbus.Subscribe;
 
 import java.util.Set;
 
+import io.rong.imkit.IMCenter;
 import io.rong.imkit.conversation.ConversationFragment;
+import io.rong.imlib.IRongCallback;
+import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
+import io.rong.imlib.model.Message;
+import io.rong.message.TextMessage;
 
 /**
  * 聊天界面
@@ -77,34 +83,61 @@ public class ChatActivity extends AbsOTOActivity {
         FragmentTransaction transaction = manager.beginTransaction();
         transaction.replace(R.id.container, conversationFragment);
         transaction.commit();
-
+        initChatUpData();
         Bundle bundle = getIntent().getExtras();
         if (bundle != null) {
             int bundleInt = bundle.getInt("type", -1);
-            if (bundleInt == CALL_CHAT_TYPE_GIFT) {
-                String data = bundle.getString("data");
-                if (data != null) {
-                    SendConsumeBean bean = JSONObject.parseObject(data, SendConsumeBean.class);
-                    if (bean.getProp().getId() == 0) {
-                        return;
-                    }
-                    ImageView imageView = new ImageView(this);
+            String data = bundle.getString("data");
+            SendConsumeBean bean = JSONObject.parseObject(data, SendConsumeBean.class);
+            if (bean == null) {
+                return;
+            }
+            if (bundleInt == CALL_CHAT_TYPE_GIFT || bundleInt == CALL_CHAT_TYPE_MATCH) {
+                System.out.println("匹配數據：" + data);
+                if (bean.getProp().getId() == 0) {
+                    return;
+                }
+                ImageView imageView = new ImageView(this);
+
+                new TipsDialog(mContext)
+                        .setTitle(WordUtil.getNewString(R.string.dialog_normal_title))
+                        .setContent(WordUtil.getNewString(R.string.dialog_normal_content) + bean.getProp().getCnTitle() + "*" + bean.getProp().getNum())
+                        .setContentView(imageView)
+                        .setApplyText(WordUtil.getNewString(R.string.dialog_call_prop_apply))
+                        .setOnDialogClickListener(new OnDialogClickListener() {
+                            @Override
+                            public void onCreateView(View itemView) {
+                                super.onCreateView(itemView);
+                                ImgLoader.display(ChatActivity.this, bean.getProp().getIcon(), (ImageView) itemView);
+                            }
+                        }).showDialog();
+            } else if (bundleInt == CALL_CHAT_TYPE_CHAT_UP) {
+                String token = bundle.getString("token", "");
+                if (!StringUtil.isEmpty(bean.getAccostMsg())) {
+                    Conversation.ConversationType conversationType = Conversation.ConversationType.PRIVATE;
+                    TextMessage messageContent = TextMessage.obtain(bean.getAccostMsg());
+                    Message message = Message.obtain(targetId, conversationType, messageContent);
+                    IMCenter.getInstance().sendMessage(message, null, null, new IRongCallback.ISendMessageCallback() {
+                        @Override
+                        public void onAttached(Message message) {
+
+                        }
+
+                        @Override
+                        public void onSuccess(Message message) {
+                            SendMessageManager.onCallSuccess(token, null);
+                        }
+
+                        @Override
+                        public void onError(Message message, RongIMClient.ErrorCode errorCode) {
+
+                        }
+                    });
 
-                    new TipsDialog(mContext)
-                            .setTitle(WordUtil.getNewString(R.string.dialog_normal_title))
-                            .setContent(WordUtil.getNewString(R.string.dialog_normal_content) + bean.getProp().getCnTitle() + "*" + bean.getProp().getNum())
-                            .setContentView(imageView)
-                            .setOnDialogClickListener(new OnDialogClickListener() {
-                                @Override
-                                public void onCreateView(View itemView) {
-                                    super.onCreateView(itemView);
-                                    ImgLoader.display(ChatActivity.this, bean.getProp().getIcon(), (ImageView) itemView);
-                                }
-                            }).showDialog();
                 }
             }
         }
-        initChatUpData();
+
 
     }
 
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeHotListAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeHotListAdapter.java
index fb325e7da..24639a8ac 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeHotListAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeHotListAdapter.java
@@ -1,6 +1,8 @@
 package com.shayu.onetoone.adapter;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,11 +12,20 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.shayu.onetoone.R;
+import com.shayu.onetoone.activity.message.ChatActivity;
 import com.shayu.onetoone.bean.HomeItemBean;
+import com.shayu.onetoone.bean.SendConsumeBean;
+import com.shayu.onetoone.dialog.TipsDialog;
+import com.shayu.onetoone.listener.OnDialogClickListener;
+import com.shayu.onetoone.listener.OnSendMessageListener;
+import com.shayu.onetoone.manager.SendMessageManager;
 import com.shayu.onetoone.utils.ConversationUtils;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -105,7 +116,45 @@ public class HomeHotListAdapter extends RecyclerView.Adapter<HomeHotListAdapter.
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    ConversationUtils.startConversation(mContext, bean.getId() + "");
+                    if (bean.getIs_accost() == 0) {
+                        ConversationUtils.startConversation(mContext, bean.getId() + "");
+                        return;
+                    }
+                    SendMessageManager.chatUp(bean.getId() + "", new OnSendMessageListener() {
+                        @Override
+                        public void onSuccess(String token, SendConsumeBean sb) {
+                            super.onSuccess(token, sb);
+                            System.out.println("搭讪回调:" + JSONObject.toJSONString(sb));
+                            Bundle bundle = new Bundle();
+                            bundle.putString("token", token);
+                            bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_CHAT_UP);
+                            bundle.putString("data", JSONObject.toJSONString(sb));
+                            ConversationUtils.startConversation(mContext, bean.getId() + "", bundle);
+                        }
+
+                        @Override
+                        public void onError(int status, String msg, SendConsumeBean bean) {
+                            super.onError(status, msg, bean);
+                            if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
+                                new TipsDialog(mContext)
+                                        .setTitle(WordUtil.getNewString(R.string.money_title))
+                                        .setApplyText(WordUtil.getNewString(R.string.money_apply))
+                                        .setOnDialogClickListener(new OnDialogClickListener() {
+                                            @Override
+                                            public void onApply(Dialog dialog) {
+                                                super.onApply(dialog);
+                                                ToastUtil.showDebug("跳充值页面");
+                                            }
+                                        })
+                                        .setCancelText(WordUtil.getNewString(R.string.money_cancel))
+                                        .showDialog();
+                            } else {
+                                new TipsDialog(mContext)
+                                        .setTitle(msg)
+                                        .showDialog();
+                            }
+                        }
+                    });
                 }
             });
         }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java
index 53a444720..0b85fb4e2 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java
@@ -102,7 +102,8 @@ public class HomeRankListAdapter extends RecyclerView.Adapter<HomeRankListAdapte
                 follow.setVisibility(View.VISIBLE);
             }
             ImgLoader.display(mContext, bean.getAvatar(), avatar);
-            follow.setText(bean.getUid());
+            follow.setText(R.string.layout_home_ranking_tips1);
+            follow.setTag(bean.getUid());
             follow.setOnClickListener(v -> {
                 OTONetManager.getInstance(mContext)
                         .follow(v.getTag().toString(), new HttpCallback<FollowBean>() {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java
index cedce410b..d8c6d29d9 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java
@@ -104,25 +104,31 @@ public class HomeRecommendListAdapter extends RecyclerView.Adapter<HomeRecommend
             } else {
                 sex.setImageResource(R.mipmap.ic_message_tab_woman);
             }
-            if (itemBean.getName_auth() == 1) {
+            if (itemBean.getName_auth() == 2) {
                 auth.setVisibility(View.VISIBLE);
             } else {
                 auth.setVisibility(View.GONE);
             }
-            if(itemBean.getIs_accost()==1){
+            if (itemBean.getIs_accost() == 1) {
                 chat.setImageResource(R.mipmap.ic_home_recommend_chat_up);
-            }else{
+            } else {
                 chat.setImageResource(R.mipmap.ic_home_recommend_chat);
             }
             ImgLoader.display(mContext, itemBean.getAvatar(), avatar);
             chat.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    if (itemBean.getIs_accost() == 0) {
+                        ConversationUtils.startConversation(mContext, itemBean.getId() + "");
+                        return;
+                    }
                     SendMessageManager.chatUp(itemBean.getId() + "", new OnSendMessageListener() {
                         @Override
                         public void onSuccess(String token, SendConsumeBean bean) {
                             super.onSuccess(token, bean);
+                            System.out.println("搭讪回调:" + JSONObject.toJSONString(bean));
                             Bundle bundle = new Bundle();
+                            bundle.putString("token", token);
                             bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_CHAT_UP);
                             bundle.putString("data", JSONObject.toJSONString(bean));
                             ConversationUtils.startConversation(mContext, itemBean.getId() + "", bundle);
@@ -144,7 +150,7 @@ public class HomeRecommendListAdapter extends RecyclerView.Adapter<HomeRecommend
                                         })
                                         .setCancelText(WordUtil.getNewString(R.string.money_cancel))
                                         .showDialog();
-                            }else{
+                            } else {
                                 new TipsDialog(mContext)
                                         .setTitle(msg)
                                         .showDialog();
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
index dbea755fa..92a4e2a59 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
@@ -6,6 +6,7 @@ import com.shayu.onetoone.R;
 import com.shayu.onetoone.bean.MessageChatAuthContent;
 import com.shayu.onetoone.bean.MessageChatGiftContent;
 import com.yanzhenjie.recyclerview.SwipeRecyclerView;
+import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.WordUtil;
 
 import androidx.annotation.NonNull;
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/HomeItemBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/HomeItemBean.java
index c2f9ce65f..6285c0585 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/bean/HomeItemBean.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/HomeItemBean.java
@@ -16,12 +16,12 @@ public class HomeItemBean extends BaseModel {
     private int b_y;
     private int b_ym;
     private int b_ymd;
-    private int name_auth;
+    private int name_auth;//1未认证 2已认证 3审核中 4被拒绝
     private long name_auth_time;
     private String auth_front;
     private String auth_back;
     private String auth_remark;
-    private int sage_auth;
+    private int sage_auth;//1未认证 2已认证 3审核中 4被拒绝
     private long sage_auth_time;
     private int is_hot;
     private String vodie_price;
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/SendConsumeBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/SendConsumeBean.java
index 079645df0..c544c0aad 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/bean/SendConsumeBean.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/SendConsumeBean.java
@@ -13,10 +13,19 @@ public class SendConsumeBean extends BaseModel {
     private long mp3Time;
     private int code;
     private String msg;
+    private String accostMsg;
 
     public SendConsumeBean() {
     }
 
+    public String getAccostMsg() {
+        return accostMsg;
+    }
+
+    public void setAccostMsg(String accostMsg) {
+        this.accostMsg = accostMsg;
+    }
+
     public UserBean getMateUser() {
         return mateUser;
     }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/UserBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/UserBean.java
index 2831e4dba..0986350d5 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/bean/UserBean.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/UserBean.java
@@ -1,6 +1,7 @@
 package com.shayu.onetoone.bean;
 
 
+import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.IMLoginModel;
 
@@ -8,6 +9,7 @@ public class UserBean extends BaseModel {
     IMLoginModel user;
     UserInfo info;
     UserLevel level;
+    @SerializedName("gift_num")
     int giftNum;
 
     int status; //0 需要跳转到 编辑资料页面
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/dialog/FirstTipsDialog.java b/OneToOne/src/main/java/com/shayu/onetoone/dialog/FirstTipsDialog.java
index 752ff4e73..227dd6d23 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/dialog/FirstTipsDialog.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/dialog/FirstTipsDialog.java
@@ -52,7 +52,9 @@ public class FirstTipsDialog extends AbsFullDialogPopupWindow {
     }
 
     private void setModel() {
+        if(isHome){
 
+        }
     }
 
     @Override
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
index 731911772..03a5da3dd 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
@@ -8,11 +8,13 @@ import android.text.TextUtils;
 import android.view.SurfaceView;
 
 import com.blankj.utilcode.util.PermissionUtils;
+import com.shayu.onetoone.AppContext;
 import com.shayu.onetoone.R;
 import com.shayu.onetoone.bean.SendConsumeBean;
 import com.shayu.onetoone.listener.OnCallStatusListener;
 import com.shayu.onetoone.listener.OnSendMessageListener;
 import com.yunbao.common.CommonAppContext;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 
@@ -24,6 +26,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import io.rong.callkit.util.CallKitUtils;
+import io.rong.calllib.CallUserProfile;
 import io.rong.calllib.IRongCallListener;
 import io.rong.calllib.IRongReceivedCallListener;
 import io.rong.calllib.RongCallClient;
@@ -65,6 +68,13 @@ public class CallClientManager {
     }
 
     public SurfaceView getRemoteVideo() {
+        if (RongCallClient.getInstance() != null) {
+            for (CallUserProfile profile : RongCallClient.getInstance().getCallSession().getParticipantProfileList()) {
+                if (!profile.getUserId().equals(IMLoginManager.get(AppContext.getTopActivity()).getUserInfo().getId() + "")) {
+                    return profile.getVideoView();
+                }
+            }
+        }
         return remoteVideo;
     }
 
@@ -522,12 +532,12 @@ public class CallClientManager {
          *                    如果对端调用{@link RongCallClient#startCall(int, boolean, Conversation.ConversationType, String, List, List, RongCallCommon.CallMediaType, String, StartCameraCallback)} 或
          *                    {@link RongCallClient#acceptCall(String, int, boolean, StartCameraCallback)}开始的音视频通话，则可以使用如下设置改变对端视频流的镜像显示：<br />
          *                    <pre class="prettyprint">
-         *                                                                                                                                                                                                                                                                                                   public void onRemoteUserJoined(String userId, RongCallCommon.CallMediaType mediaType, int userType, SurfaceView remoteVideo) {
-         *                                                                                                                                                                                                                                                                                                        if (null != remoteVideo) {
-         *                                                                                                                                                                                                                                                                                                            ((RongRTCVideoView) remoteVideo).setMirror( boolean);//观看对方视频流是否镜像处理
-         *                                                                                                                                                                                                                                                                                                        }
-         *                                                                                                                                                                                                                                                                                                   }
-         *                                                                                                                                                                                                                                                                                                   </pre>
+         *                                                                                                                                                                                                                                                                                                                      public void onRemoteUserJoined(String userId, RongCallCommon.CallMediaType mediaType, int userType, SurfaceView remoteVideo) {
+         *                                                                                                                                                                                                                                                                                                                           if (null != remoteVideo) {
+         *                                                                                                                                                                                                                                                                                                                               ((RongRTCVideoView) remoteVideo).setMirror( boolean);//观看对方视频流是否镜像处理
+         *                                                                                                                                                                                                                                                                                                                           }
+         *                                                                                                                                                                                                                                                                                                                      }
+         *                                                                                                                                                                                                                                                                                                                      </pre>
          */
         @Override
         public void onRemoteUserJoined(String userId, RongCallCommon.CallMediaType mediaType, int userType, SurfaceView remoteVideo) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
index c99d160e9..5fe0daad6 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
@@ -88,6 +88,11 @@ public class OTONetManager {
                     @Override
                     public void accept(ResponseModel<IMLoginModel> imLoginModelResponseModel) throws Exception {
                         if (callback != null) {
+                            if(imLoginModelResponseModel.isError()){
+                                JSONObject jsonSrc = imLoginModelResponseModel.getSrcJSONOBject();
+                                callback.onError(jsonSrc.getJSONObject("data").getString("msg"));
+                                return;
+                            }
                             IMLoginModel model = imLoginModelResponseModel.getData().getInfo();
                             callback.onSuccess(model);
                         }
@@ -941,7 +946,6 @@ public class OTONetManager {
     }
 
 
-
     public void getMatchingInfo(HttpCallback<MatchingInfoBean> callback) {
 
         API.get().otoApi(mContext)
@@ -1004,6 +1008,7 @@ public class OTONetManager {
                     }
                 }).isDisposed();
     }
+
     /**
      * 设置基本资料
      */
@@ -1033,6 +1038,7 @@ public class OTONetManager {
 
     /**
      * 设置
+     *
      * @param key 'signature' => "签名",
      *            'sex' => "性别",
      *            'user_nicename' => "昵称",
@@ -1054,9 +1060,13 @@ public class OTONetManager {
                     @Override
                     public void accept(ResponseModel<List<BaseModel>> listResponseModel) throws Exception {
                         if (listResponseModel.getData().getCode() == 0) {
-                            callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
+                            if (callback != null) {
+                                callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
+                            }
                         } else {
-                            callback.onError(listResponseModel.getData().getMsg());
+                            if (callback != null) {
+                                callback.onError(listResponseModel.getData().getMsg());
+                            }
                         }
                     }
                 }, new Consumer<Throwable>() {
@@ -1125,7 +1135,7 @@ public class OTONetManager {
      */
     public void getFriendAppMoneyLogModel(String currencyType, String income, int page, HttpCallback<List<FriendAppMoneyLogModel>> callback) {
         API.get().otoApi(mContext).
-                getFriendAppMoneyLogModel(currencyType, income,page)
+                getFriendAppMoneyLogModel(currencyType, income, page)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<List<FriendAppMoneyLogModel>>>() {
@@ -1287,9 +1297,9 @@ public class OTONetManager {
                 }).isDisposed();
     }
 
-    public void getFriends(int page,HttpCallback<List<HomeItemBean>> callback) {
+    public void getFriends(int page, HttpCallback<List<HomeItemBean>> callback) {
         API.get().otoApi(mContext).
-                getFriends(page+"")
+                getFriends(page + "")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(listResponseModel -> {
@@ -1304,9 +1314,10 @@ public class OTONetManager {
                     }
                 }).isDisposed();
     }
-    public void getFollows(int page,HttpCallback<List<HomeItemBean>> callback) {
+
+    public void getFollows(int page, HttpCallback<List<HomeItemBean>> callback) {
         API.get().otoApi(mContext).
-                getFollows(page+"")
+                getFollows(page + "")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(listResponseModel -> {
@@ -1321,9 +1332,10 @@ public class OTONetManager {
                     }
                 }).isDisposed();
     }
-    public void getFans(int page,HttpCallback<List<HomeItemBean>> callback) {
+
+    public void getFans(int page, HttpCallback<List<HomeItemBean>> callback) {
         API.get().otoApi(mContext).
-                getFans(page+"")
+                getFans(page + "")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(listResponseModel -> {
@@ -1338,6 +1350,7 @@ public class OTONetManager {
                     }
                 }).isDisposed();
     }
+
     public void getPeopleNum(HttpCallback<PeopleNum> callback) {
         API.get().otoApi(mContext).
                 getPeopleNum()
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/SendMessageManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/SendMessageManager.java
index 9fbbf46a5..858b67813 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/manager/SendMessageManager.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/SendMessageManager.java
@@ -113,8 +113,7 @@ public class SendMessageManager {
                 "搭讪消息",
                 "1",
                 1,
-                "after",
-                false
+                true
         );
         send(sendData, listener);
     }
diff --git a/OneToOne/src/main/res/layout/activity_call_video.xml b/OneToOne/src/main/res/layout/activity_call_video.xml
index 3d0714f08..46b9a2312 100644
--- a/OneToOne/src/main/res/layout/activity_call_video.xml
+++ b/OneToOne/src/main/res/layout/activity_call_video.xml
@@ -18,15 +18,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
-    <FrameLayout
-        android:orientation="horizontal"
-        android:id="@+id/target_view"
-        android:layout_width="114dp"
-        android:layout_height="164dp"
-        android:layout_marginTop="124dp"
-        android:layout_marginEnd="17dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+
 
     <RelativeLayout
         android:id="@+id/rc_voip_two_btn"
diff --git a/OneToOne/src/main/res/layout/fragment_my.xml b/OneToOne/src/main/res/layout/fragment_my.xml
index 6b423b6f7..92ca73775 100644
--- a/OneToOne/src/main/res/layout/fragment_my.xml
+++ b/OneToOne/src/main/res/layout/fragment_my.xml
@@ -75,6 +75,7 @@
                                 android:layout_width="28dp"
                                 android:layout_height="28dp"
                                 android:layout_alignParentBottom="true"
+                                android:layout_marginBottom="20dp"
                                 android:layout_alignParentRight="true"
                                 app:srcCompat="@mipmap/ic_message_tab_man" />
 
diff --git a/OneToOne/src/main/res/layout/view_call_video_item.xml b/OneToOne/src/main/res/layout/view_call_video_item.xml
index 8f9e94e1a..6a9d642db 100644
--- a/OneToOne/src/main/res/layout/view_call_video_item.xml
+++ b/OneToOne/src/main/res/layout/view_call_video_item.xml
@@ -5,7 +5,15 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
+    <FrameLayout
+        android:orientation="horizontal"
+        android:id="@+id/target_view"
+        android:layout_width="114dp"
+        android:layout_height="164dp"
+        android:layout_marginTop="124dp"
+        android:layout_marginEnd="17dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/call_stop"
diff --git a/OneToOne/src/main/res/values-zh-rHK/strings.xml b/OneToOne/src/main/res/values-zh-rHK/strings.xml
index 5e339c6bc..3032b24eb 100644
--- a/OneToOne/src/main/res/values-zh-rHK/strings.xml
+++ b/OneToOne/src/main/res/values-zh-rHK/strings.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">1v1</string>
-    <string name="title_activity_tag_selection">选择活动</string>
+    <string name="title_activity_tag_selection">選擇活動</string>
     <string name="message_chat_tip1">【安全提示】為保障您的權益，慶提高警惕，不要輕易添加或提供第三方聯繫方式</string>
     <string name="system_tip_success">成功</string>
-    <string name="system_tip_failure">失败</string>
-    <string name="system_tip_error">错误</string>
+    <string name="system_tip_failure">失敗</string>
+    <string name="system_tip_error">錯誤</string>
     <string name="home_label_friends">交友</string>
-    <string name="home_label_dynamic">动态</string>
+    <string name="home_label_dynamic">動態</string>
     <string name="home_label_chat">消息</string>
     <string name="home_label_my">我的</string>
     <string name="greet_switch_title">打招呼文案</string>
-    <string name="greet_upload_img">上传图片(非必選）</string>
-    <string name="greet_clear_config">清除设置</string>
-    <string name="greet_save_config">保存设置</string>
+    <string name="greet_upload_img">上傳圖片(非必選）</string>
+    <string name="greet_clear_config">清除設置</string>
+    <string name="greet_save_config">保存設置</string>
     <string name="my_arnings">我的收益</string>
     <string name="my_arnings_reward_description">獎勵說明</string>
     <string name="my_arnings_total_amount_available_for_withdrawal">可提現總額</string>
@@ -32,43 +32,43 @@
     <string name="diamond_exchange_immediate_exchange">立即兌換</string>
     <string name="diamond_exchange_full_conversion">全額兌換</string>
 
-    <string name="choose_img_max">最多选&#160;%1$s&#160;张图片哦</string>
+    <string name="choose_img_max">最多選&#160;%1$s&#160;張圖片哦</string>
     <string name="view_friend_empty_text">暫無好友消息~</string>
     <string name="not_money">餘額不足</string>
     <string name="not_money_tips">文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
 
     <string name="not_money_video_tips">與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
-    <string name="not_money_audio_tips">與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
+    <string name="not_money_audio_tips">與TA語音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
     <string name="not_money_text_tips">聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
     <string name="dialog_cancel_tip">離開</string>
     <string name="dialog_to_money_tip">去充值</string>
-    <string name="chat_video_tips">发起视频通话\n%s钻/分钟</string>
-    <string name="chat_audio_tips">发起语音通话\n%s钻/分钟</string>
-    <string name="album">相册</string>
+    <string name="chat_video_tips">發起視頻通話\n%s鑽/分鐘</string>
+    <string name="chat_audio_tips">發起語音通話\n%s鑽/分鐘</string>
+    <string name="album">相冊</string>
     <string name="camera">拍照</string>
-    <string name="photo_info">图片信息</string>
-    <string name="copy">复制</string>
-    <string name="delete">删除</string>
-    <string name="top">置顶</string>
-    <string name="copy_success">复制成功</string>
-    <string name="upload_in_progress">上传中</string>
-    <string name="upload_success">上传成功</string>
-    <string name="upload_failed">上传失败</string>
+    <string name="photo_info">圖片信息</string>
+    <string name="copy">複製</string>
+    <string name="delete">刪除</string>
+    <string name="top">置頂</string>
+    <string name="copy_success">複製成功</string>
+    <string name="upload_in_progress">上傳中</string>
+    <string name="upload_success">上傳成功</string>
+    <string name="upload_failed">上傳失敗</string>
     <string name="year">年</string>
     <string name="month">月</string>
     <string name="day">日</string>
     <string name="birthday">生日</string>
     <string name="complete">完成</string>
     <string name="complete2">完成</string>
-    <string name="nickname_hint">请填写昵称</string>
-    <string name="gender_hint">请选择性别</string>
-    <string name="permission_hint">请允许悬浮窗权限才能进行小窗</string>
-    <string name="permission_setting">设置</string>
+    <string name="nickname_hint">請填寫昵稱</string>
+    <string name="gender_hint">請選擇性別</string>
+    <string name="permission_hint">請允許懸浮窗權限才能進行小窗</string>
+    <string name="permission_setting">設置</string>
     <string name="permission_cancel">取消</string>
-    <string name="call_time">通话时长:</string>
-    <string name="call_tips">通话将在%s秒后断\n开，请及时充值</string>
-    <string name="dialog_normal_title">首次匹配成功奖励</string>
-    <string name="dialog_normal_content">恭喜获得</string>
+    <string name="call_time">通話時長:</string>
+    <string name="call_tips">通話將在%s秒后斷\n開，請及時充值</string>
+    <string name="dialog_normal_title">首次匹配成功獎勵</string>
+    <string name="dialog_normal_content">恭喜獲得</string>
     <string name="title_greet_config">打招呼設置</string>
     <string name="title_audit_config">審核中，請耐心等待</string>
     <string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
@@ -80,69 +80,69 @@
     <string name="resubmit">重新提交</string>
     <string name="upload_enter_title">上傳入駐資料</string>
     <string name="user_authentication">達人認證</string>
-    <string name="query">查询中</string>
+    <string name="query">查詢中</string>
     <string name="to_upload">去上傳</string>
     <string name="search_empty">請輸入內容</string>
     <string name="matching_quit_title">確定要退出靈魂速配嗎？</string>
     <string name="matching_quit_cancel">繼續匹配</string>
     <string name="matching_quit_apply">徹底離開</string>
-    <string name="matching_wait_title">当前等待时间较长，建议您先去观看动态哦，稍后再来哦~</string>
+    <string name="matching_wait_title">當前等待時間較長，建議您先去觀看動態哦，稍後再來哦~</string>
     <string name="matching_wait_cancel">繼續匹配</string>
-    <string name="matching_wait_apply">去看动态</string>
-    <string name="money_title">余额不足，请充值后再进行尝试吧~</string>
+    <string name="matching_wait_apply">去看動態</string>
+    <string name="money_title">餘額不足，請充值后再進行嘗試吧~</string>
     <string name="money_cancel">取消</string>
     <string name="money_apply">前往充值</string>
     <string name="gift">[禮物]</string>
     <string name="authentication">[邀請認證]</string>
-    <string name="call_tips1">等待对方接受邀请…</string>
-    <string name="call_tips2">连接成功</string>
-    <string name="permission_request_title">需要获取您的权限</string>
+    <string name="call_tips1">等待對方接受邀請…</string>
+    <string name="call_tips2">連接成功</string>
+    <string name="permission_request_title">需要獲取您的權限</string>
     <string name="request_authentication_tips1">邀請對方完成真人認證，開通通話權限</string>
-    <string name="request_authentication_tips2">待开通</string>
+    <string name="request_authentication_tips2">待開通</string>
     <string name="request_authentication_tips3">對方邀請您完成真人認證，開通通話權限</string>
-    <string name="request_authentication_tips4">去开通</string>
-    <string name="gift_send_ta">送给TA</string>
-    <string name="gift_send_you">送给你</string>
-    <string name="dialog_apply">确定</string>
+    <string name="request_authentication_tips4">去開通</string>
+    <string name="gift_send_ta">送給TA</string>
+    <string name="gift_send_you">送給你</string>
+    <string name="dialog_apply">確定</string>
 
     <string name="layout_auth_tips1">真人說明</string>
-    <string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
+    <string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
     <string name="layout_auth_tips3">身份證正面</string>
     <string name="layout_auth_tips4">身份證背面</string>
     <string name="layout_auth_tips5">發起審核</string>
 
-    <string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
-    <string name="layout_auth_blogger_tips2">性别</string>
+    <string name="layout_auth_blogger_tips1">帶*為必填項,為保障您的利益，請如實填寫</string>
+    <string name="layout_auth_blogger_tips2">性別</string>
     <string name="layout_auth_blogger_tips3">男</string>
     <string name="layout_auth_blogger_tips4">女</string>
-    <string name="layout_auth_blogger_tips5">真实姓名</string>
+    <string name="layout_auth_blogger_tips5">真實姓名</string>
     <string name="layout_auth_blogger_tips6">請填寫您的真實姓名</string>
-    <string name="layout_auth_blogger_tips7">手机号码</string>
-    <string name="layout_auth_blogger_tips8">請填寫您的手机号码</string>
-    <string name="layout_auth_blogger_tips9">身份证号码</string>
-    <string name="layout_auth_blogger_tips10">請填寫您的身份证号码</string>
-    <string name="layout_auth_blogger_tips11">上传手持证件照</string>
-    <string name="layout_auth_blogger_tips12">請將证件頭像朝向前方</string>
+    <string name="layout_auth_blogger_tips7">手機號碼</string>
+    <string name="layout_auth_blogger_tips8">請填寫您的手機號碼</string>
+    <string name="layout_auth_blogger_tips9">身份證號碼</string>
+    <string name="layout_auth_blogger_tips10">請填寫您的身份證號碼</string>
+    <string name="layout_auth_blogger_tips11">上傳手持證件照</string>
+    <string name="layout_auth_blogger_tips12">請將證件頭像朝向前方</string>
     <string name="layout_auth_blogger_tips13">參考圖</string>
     <string name="layout_auth_blogger_tips14">上傳背景圖片</string>
     <string name="layout_auth_blogger_tips15">發起審核</string>
 
     <string name="layout_auth_blogger_inlet_tips1">真人說明</string>
-    <string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
-    <string name="layout_auth_blogger_inlet_tips3">條件一：完後真人認證 </string>
+    <string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
+    <string name="layout_auth_blogger_inlet_tips3">條件一：完后真人認證 </string>
     <string name="layout_auth_blogger_inlet_tips4">已完成</string>
     <string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
     <string name="layout_auth_blogger_inlet_tips6">已完成</string>
 
-    <string name="layout_choose_label_tip1">跳过</string>
-    <string name="layout_choose_label_tip2">我的标签</string>
-    <string name="layout_choose_label_tip3">暂无标签</string>
+    <string name="layout_choose_label_tip1">跳過</string>
+    <string name="layout_choose_label_tip2">我的標籤</string>
+    <string name="layout_choose_label_tip3">暫無標籤</string>
     <string name="layout_choose_label_tip4">完成</string>
 
-    <string name="layout_complete_tip1">完善个人信息</string>
-    <string name="layout_complete_tip2">去选择</string>
-    <string name="layout_complete_tip3">昵称</string>
-    <string name="layout_complete_tip4">性别</string>
+    <string name="layout_complete_tip1">完善個人信息</string>
+    <string name="layout_complete_tip2">去選擇</string>
+    <string name="layout_complete_tip3">昵稱</string>
+    <string name="layout_complete_tip4">性別</string>
     <string name="layout_complete_tip5">女</string>
     <string name="layout_complete_tip6">男</string>
     <string name="layout_complete_tip7">生日</string>
@@ -160,34 +160,34 @@
     <string name="layout_edit_profile_tip8">真人認證</string>
     <string name="layout_edit_profile_tip9">興趣</string>
 
-    <string name="layout_find_pwd_tip1">忘记密码</string>
+    <string name="layout_find_pwd_tip1">忘記密碼</string>
 
-    <string name="layout_login_tip1">用户登录</string>
+    <string name="layout_login_tip1">用戶登錄</string>
 
     <string name="layout_main_list_tip1">魅力榜</string>
-    <string name="layout_main_list_tip2">财富榜</string>
+    <string name="layout_main_list_tip2">財富榜</string>
 
-    <string name="layout_matching_tip1">正在热聊中</string>
+    <string name="layout_matching_tip1">正在熱聊中</string>
     <string name="layout_matching_tip2">匹配中…</string>
     <string name="layout_matching_tip3">TA還在練習見面開場白，再給TA點時間吧~</string>
-    <string name="layout_matching_tip4">灵魂速配</string>
+    <string name="layout_matching_tip4">靈魂速配</string>
 
     <string name="layout_msg_message_tip1">聯繫客服</string>
 
-    <string name="layout_register_tip1">用户注册</string>
+    <string name="layout_register_tip1">用戶註冊</string>
 
-    <string name="layout_screen_tip1">年龄</string>
+    <string name="layout_screen_tip1">年齡</string>
     <string name="layout_screen_tip2">全部</string>
     <string name="layout_screen_tip3">40以上</string>
-    <string name="layout_screen_tip4">性别</string>
+    <string name="layout_screen_tip4">性別</string>
     <string name="layout_screen_tip5">男</string>
     <string name="layout_screen_tip6">女</string>
-    <string name="layout_screen_tip7">是否完成真人认证</string>
+    <string name="layout_screen_tip7">是否完成真人認證</string>
     <string name="layout_screen_tip8">已完成</string>
     <string name="layout_screen_tip9">未完成</string>
-    <string name="layout_screen_tip10">确定</string>
+    <string name="layout_screen_tip10">確定</string>
 
-    <string name="layout_search_tip1">猜你喜欢</string>
+    <string name="layout_search_tip1">猜你喜歡</string>
 
     <string name="layout_setting_tip1">個人設定</string>
     <string name="layout_setting_tip2">修改密碼</string>
@@ -203,56 +203,56 @@
     <string name="layout_setting_tip12">檢查新版本</string>
     <string name="layout_setting_tip13">退出</string>
 
-    <string name="layout_choose_label_adapter_tip1">我的标签</string>
+    <string name="layout_choose_label_adapter_tip1">我的標籤</string>
 
-    <string name="layout_item_tag">活泼</string>
+    <string name="layout_item_tag">活潑</string>
 
     <string name="layout_bottom_list_tips1">取消</string>
 
-    <string name="layout_bend_call_tips1">关注</string>
-    <string name="layout_bend_call_tips2">此次通话结束了快开启\n下一次通话吧</string>
-    <string name="layout_bend_call_tips3">再次通话</string>
+    <string name="layout_bend_call_tips1">關注</string>
+    <string name="layout_bend_call_tips2">此次通話結束了快開啟\n下一次通話吧</string>
+    <string name="layout_bend_call_tips3">再次通話</string>
     <string name="layout_bend_call_tips4">去充值</string>
 
-    <string name="layout_msg_more_tips1">打招呼设置</string>
-    <string name="layout_msg_more_tips2">一键已读</string>
+    <string name="layout_msg_more_tips1">打招呼設置</string>
+    <string name="layout_msg_more_tips2">一鍵已讀</string>
 
-    <string name="layout_friends_tips1">推荐</string>
-    <string name="layout_friends_tips2">热门</string>
+    <string name="layout_friends_tips1">推薦</string>
+    <string name="layout_friends_tips2">熱門</string>
 
-    <string name="layout_home_ranking_tips1">关注</string>
+    <string name="layout_home_ranking_tips1">關注</string>
 
     <string name="layout_f_msg_tips1">消息</string>
     <string name="layout_f_msg_tips2">好友</string>
 
     <string name="layout_f_my_tips1">用戶名稱</string>
-    <string name="layout_f_my_tips2">这个人很懒，什么也没留下。</string>
+    <string name="layout_f_my_tips2">這個人很懶，什麼也沒留下。</string>
 
-    <string name="layout_i_greet_config_tips1">请输入文案</string>
+    <string name="layout_i_greet_config_tips1">請輸入文案</string>
 
     <string name="layout_i_sys_msg_tips1">點擊查看</string>
 
     <string name="layout_call_input_tips1">輸入信息</string>
     <string name="layout_f_system_tips1">聯繫客服</string>
-    <string name="layout_v_empty_list_tips1">没有找到匹配结果~</string>
+    <string name="layout_v_empty_list_tips1">沒有找到匹配結果~</string>
 
     <string name="layout_d_msg_chat_auth_tips1">對方邀請您完成真人認證，開通通話權限</string>
-    <string name="layout_d_msg_chat_auth_tips2">去开通</string>
+    <string name="layout_d_msg_chat_auth_tips2">去開通</string>
 
     <string name="layout_d_msg_gift_tips1">送給你</string>
 
     <string name="layout_d_send_gift_tips1">充值</string>
 
-    <string name="layout_d_msg_bar_tips1">查看主页</string>
+    <string name="layout_d_msg_bar_tips1">查看主頁</string>
 
     <string name="layout_v_greet_config_add_tips1">添加更多</string>
     <string name="layout_v_custom_tips1">保存</string>
-    <string name="activity_my_friend_list_fans">被關註</string>
+    <string name="activity_my_friend_list_fans">被關注</string>
     <string name="activity_my_friend_list_follow">關注</string>
-    <string name="activity_my_friend_list_friend">互動關註</string>
+    <string name="activity_my_friend_list_friend">互動關注</string>
     <string name="activity_my_friend_list_people">人</string>
 
-    <string name="activity_my_friend_list_item_0">未關註</string>
+    <string name="activity_my_friend_list_item_0">未關注</string>
     <string name="activity_my_friend_list_item_1">回關</string>
     <string name="activity_my_friend_list_item_2">已關注</string>
     <string name="activity_my_friend_list_item_3">相互關注</string>
@@ -260,4 +260,7 @@
     <string name="activity_my_friend_fans">粉絲</string>
     <string name="activity_my_friend_follow">關注</string>
     <string name="activity_my_friend_friend">好友</string>
+
+    <string name="dialog_call_prop_apply">收下獎勵</string>
+    <string name="toast_call_not_unlock">發送任意禮物后即可解鎖</string>
 </resources>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/values-zh-rTW/strings.xml b/OneToOne/src/main/res/values-zh-rTW/strings.xml
index 5e339c6bc..3032b24eb 100644
--- a/OneToOne/src/main/res/values-zh-rTW/strings.xml
+++ b/OneToOne/src/main/res/values-zh-rTW/strings.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">1v1</string>
-    <string name="title_activity_tag_selection">选择活动</string>
+    <string name="title_activity_tag_selection">選擇活動</string>
     <string name="message_chat_tip1">【安全提示】為保障您的權益，慶提高警惕，不要輕易添加或提供第三方聯繫方式</string>
     <string name="system_tip_success">成功</string>
-    <string name="system_tip_failure">失败</string>
-    <string name="system_tip_error">错误</string>
+    <string name="system_tip_failure">失敗</string>
+    <string name="system_tip_error">錯誤</string>
     <string name="home_label_friends">交友</string>
-    <string name="home_label_dynamic">动态</string>
+    <string name="home_label_dynamic">動態</string>
     <string name="home_label_chat">消息</string>
     <string name="home_label_my">我的</string>
     <string name="greet_switch_title">打招呼文案</string>
-    <string name="greet_upload_img">上传图片(非必選）</string>
-    <string name="greet_clear_config">清除设置</string>
-    <string name="greet_save_config">保存设置</string>
+    <string name="greet_upload_img">上傳圖片(非必選）</string>
+    <string name="greet_clear_config">清除設置</string>
+    <string name="greet_save_config">保存設置</string>
     <string name="my_arnings">我的收益</string>
     <string name="my_arnings_reward_description">獎勵說明</string>
     <string name="my_arnings_total_amount_available_for_withdrawal">可提現總額</string>
@@ -32,43 +32,43 @@
     <string name="diamond_exchange_immediate_exchange">立即兌換</string>
     <string name="diamond_exchange_full_conversion">全額兌換</string>
 
-    <string name="choose_img_max">最多选&#160;%1$s&#160;张图片哦</string>
+    <string name="choose_img_max">最多選&#160;%1$s&#160;張圖片哦</string>
     <string name="view_friend_empty_text">暫無好友消息~</string>
     <string name="not_money">餘額不足</string>
     <string name="not_money_tips">文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
 
     <string name="not_money_video_tips">與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
-    <string name="not_money_audio_tips">與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
+    <string name="not_money_audio_tips">與TA語音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
     <string name="not_money_text_tips">聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
     <string name="dialog_cancel_tip">離開</string>
     <string name="dialog_to_money_tip">去充值</string>
-    <string name="chat_video_tips">发起视频通话\n%s钻/分钟</string>
-    <string name="chat_audio_tips">发起语音通话\n%s钻/分钟</string>
-    <string name="album">相册</string>
+    <string name="chat_video_tips">發起視頻通話\n%s鑽/分鐘</string>
+    <string name="chat_audio_tips">發起語音通話\n%s鑽/分鐘</string>
+    <string name="album">相冊</string>
     <string name="camera">拍照</string>
-    <string name="photo_info">图片信息</string>
-    <string name="copy">复制</string>
-    <string name="delete">删除</string>
-    <string name="top">置顶</string>
-    <string name="copy_success">复制成功</string>
-    <string name="upload_in_progress">上传中</string>
-    <string name="upload_success">上传成功</string>
-    <string name="upload_failed">上传失败</string>
+    <string name="photo_info">圖片信息</string>
+    <string name="copy">複製</string>
+    <string name="delete">刪除</string>
+    <string name="top">置頂</string>
+    <string name="copy_success">複製成功</string>
+    <string name="upload_in_progress">上傳中</string>
+    <string name="upload_success">上傳成功</string>
+    <string name="upload_failed">上傳失敗</string>
     <string name="year">年</string>
     <string name="month">月</string>
     <string name="day">日</string>
     <string name="birthday">生日</string>
     <string name="complete">完成</string>
     <string name="complete2">完成</string>
-    <string name="nickname_hint">请填写昵称</string>
-    <string name="gender_hint">请选择性别</string>
-    <string name="permission_hint">请允许悬浮窗权限才能进行小窗</string>
-    <string name="permission_setting">设置</string>
+    <string name="nickname_hint">請填寫昵稱</string>
+    <string name="gender_hint">請選擇性別</string>
+    <string name="permission_hint">請允許懸浮窗權限才能進行小窗</string>
+    <string name="permission_setting">設置</string>
     <string name="permission_cancel">取消</string>
-    <string name="call_time">通话时长:</string>
-    <string name="call_tips">通话将在%s秒后断\n开，请及时充值</string>
-    <string name="dialog_normal_title">首次匹配成功奖励</string>
-    <string name="dialog_normal_content">恭喜获得</string>
+    <string name="call_time">通話時長:</string>
+    <string name="call_tips">通話將在%s秒后斷\n開，請及時充值</string>
+    <string name="dialog_normal_title">首次匹配成功獎勵</string>
+    <string name="dialog_normal_content">恭喜獲得</string>
     <string name="title_greet_config">打招呼設置</string>
     <string name="title_audit_config">審核中，請耐心等待</string>
     <string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
@@ -80,69 +80,69 @@
     <string name="resubmit">重新提交</string>
     <string name="upload_enter_title">上傳入駐資料</string>
     <string name="user_authentication">達人認證</string>
-    <string name="query">查询中</string>
+    <string name="query">查詢中</string>
     <string name="to_upload">去上傳</string>
     <string name="search_empty">請輸入內容</string>
     <string name="matching_quit_title">確定要退出靈魂速配嗎？</string>
     <string name="matching_quit_cancel">繼續匹配</string>
     <string name="matching_quit_apply">徹底離開</string>
-    <string name="matching_wait_title">当前等待时间较长，建议您先去观看动态哦，稍后再来哦~</string>
+    <string name="matching_wait_title">當前等待時間較長，建議您先去觀看動態哦，稍後再來哦~</string>
     <string name="matching_wait_cancel">繼續匹配</string>
-    <string name="matching_wait_apply">去看动态</string>
-    <string name="money_title">余额不足，请充值后再进行尝试吧~</string>
+    <string name="matching_wait_apply">去看動態</string>
+    <string name="money_title">餘額不足，請充值后再進行嘗試吧~</string>
     <string name="money_cancel">取消</string>
     <string name="money_apply">前往充值</string>
     <string name="gift">[禮物]</string>
     <string name="authentication">[邀請認證]</string>
-    <string name="call_tips1">等待对方接受邀请…</string>
-    <string name="call_tips2">连接成功</string>
-    <string name="permission_request_title">需要获取您的权限</string>
+    <string name="call_tips1">等待對方接受邀請…</string>
+    <string name="call_tips2">連接成功</string>
+    <string name="permission_request_title">需要獲取您的權限</string>
     <string name="request_authentication_tips1">邀請對方完成真人認證，開通通話權限</string>
-    <string name="request_authentication_tips2">待开通</string>
+    <string name="request_authentication_tips2">待開通</string>
     <string name="request_authentication_tips3">對方邀請您完成真人認證，開通通話權限</string>
-    <string name="request_authentication_tips4">去开通</string>
-    <string name="gift_send_ta">送给TA</string>
-    <string name="gift_send_you">送给你</string>
-    <string name="dialog_apply">确定</string>
+    <string name="request_authentication_tips4">去開通</string>
+    <string name="gift_send_ta">送給TA</string>
+    <string name="gift_send_you">送給你</string>
+    <string name="dialog_apply">確定</string>
 
     <string name="layout_auth_tips1">真人說明</string>
-    <string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
+    <string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
     <string name="layout_auth_tips3">身份證正面</string>
     <string name="layout_auth_tips4">身份證背面</string>
     <string name="layout_auth_tips5">發起審核</string>
 
-    <string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
-    <string name="layout_auth_blogger_tips2">性别</string>
+    <string name="layout_auth_blogger_tips1">帶*為必填項,為保障您的利益，請如實填寫</string>
+    <string name="layout_auth_blogger_tips2">性別</string>
     <string name="layout_auth_blogger_tips3">男</string>
     <string name="layout_auth_blogger_tips4">女</string>
-    <string name="layout_auth_blogger_tips5">真实姓名</string>
+    <string name="layout_auth_blogger_tips5">真實姓名</string>
     <string name="layout_auth_blogger_tips6">請填寫您的真實姓名</string>
-    <string name="layout_auth_blogger_tips7">手机号码</string>
-    <string name="layout_auth_blogger_tips8">請填寫您的手机号码</string>
-    <string name="layout_auth_blogger_tips9">身份证号码</string>
-    <string name="layout_auth_blogger_tips10">請填寫您的身份证号码</string>
-    <string name="layout_auth_blogger_tips11">上传手持证件照</string>
-    <string name="layout_auth_blogger_tips12">請將证件頭像朝向前方</string>
+    <string name="layout_auth_blogger_tips7">手機號碼</string>
+    <string name="layout_auth_blogger_tips8">請填寫您的手機號碼</string>
+    <string name="layout_auth_blogger_tips9">身份證號碼</string>
+    <string name="layout_auth_blogger_tips10">請填寫您的身份證號碼</string>
+    <string name="layout_auth_blogger_tips11">上傳手持證件照</string>
+    <string name="layout_auth_blogger_tips12">請將證件頭像朝向前方</string>
     <string name="layout_auth_blogger_tips13">參考圖</string>
     <string name="layout_auth_blogger_tips14">上傳背景圖片</string>
     <string name="layout_auth_blogger_tips15">發起審核</string>
 
     <string name="layout_auth_blogger_inlet_tips1">真人說明</string>
-    <string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
-    <string name="layout_auth_blogger_inlet_tips3">條件一：完後真人認證 </string>
+    <string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
+    <string name="layout_auth_blogger_inlet_tips3">條件一：完后真人認證 </string>
     <string name="layout_auth_blogger_inlet_tips4">已完成</string>
     <string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
     <string name="layout_auth_blogger_inlet_tips6">已完成</string>
 
-    <string name="layout_choose_label_tip1">跳过</string>
-    <string name="layout_choose_label_tip2">我的标签</string>
-    <string name="layout_choose_label_tip3">暂无标签</string>
+    <string name="layout_choose_label_tip1">跳過</string>
+    <string name="layout_choose_label_tip2">我的標籤</string>
+    <string name="layout_choose_label_tip3">暫無標籤</string>
     <string name="layout_choose_label_tip4">完成</string>
 
-    <string name="layout_complete_tip1">完善个人信息</string>
-    <string name="layout_complete_tip2">去选择</string>
-    <string name="layout_complete_tip3">昵称</string>
-    <string name="layout_complete_tip4">性别</string>
+    <string name="layout_complete_tip1">完善個人信息</string>
+    <string name="layout_complete_tip2">去選擇</string>
+    <string name="layout_complete_tip3">昵稱</string>
+    <string name="layout_complete_tip4">性別</string>
     <string name="layout_complete_tip5">女</string>
     <string name="layout_complete_tip6">男</string>
     <string name="layout_complete_tip7">生日</string>
@@ -160,34 +160,34 @@
     <string name="layout_edit_profile_tip8">真人認證</string>
     <string name="layout_edit_profile_tip9">興趣</string>
 
-    <string name="layout_find_pwd_tip1">忘记密码</string>
+    <string name="layout_find_pwd_tip1">忘記密碼</string>
 
-    <string name="layout_login_tip1">用户登录</string>
+    <string name="layout_login_tip1">用戶登錄</string>
 
     <string name="layout_main_list_tip1">魅力榜</string>
-    <string name="layout_main_list_tip2">财富榜</string>
+    <string name="layout_main_list_tip2">財富榜</string>
 
-    <string name="layout_matching_tip1">正在热聊中</string>
+    <string name="layout_matching_tip1">正在熱聊中</string>
     <string name="layout_matching_tip2">匹配中…</string>
     <string name="layout_matching_tip3">TA還在練習見面開場白，再給TA點時間吧~</string>
-    <string name="layout_matching_tip4">灵魂速配</string>
+    <string name="layout_matching_tip4">靈魂速配</string>
 
     <string name="layout_msg_message_tip1">聯繫客服</string>
 
-    <string name="layout_register_tip1">用户注册</string>
+    <string name="layout_register_tip1">用戶註冊</string>
 
-    <string name="layout_screen_tip1">年龄</string>
+    <string name="layout_screen_tip1">年齡</string>
     <string name="layout_screen_tip2">全部</string>
     <string name="layout_screen_tip3">40以上</string>
-    <string name="layout_screen_tip4">性别</string>
+    <string name="layout_screen_tip4">性別</string>
     <string name="layout_screen_tip5">男</string>
     <string name="layout_screen_tip6">女</string>
-    <string name="layout_screen_tip7">是否完成真人认证</string>
+    <string name="layout_screen_tip7">是否完成真人認證</string>
     <string name="layout_screen_tip8">已完成</string>
     <string name="layout_screen_tip9">未完成</string>
-    <string name="layout_screen_tip10">确定</string>
+    <string name="layout_screen_tip10">確定</string>
 
-    <string name="layout_search_tip1">猜你喜欢</string>
+    <string name="layout_search_tip1">猜你喜歡</string>
 
     <string name="layout_setting_tip1">個人設定</string>
     <string name="layout_setting_tip2">修改密碼</string>
@@ -203,56 +203,56 @@
     <string name="layout_setting_tip12">檢查新版本</string>
     <string name="layout_setting_tip13">退出</string>
 
-    <string name="layout_choose_label_adapter_tip1">我的标签</string>
+    <string name="layout_choose_label_adapter_tip1">我的標籤</string>
 
-    <string name="layout_item_tag">活泼</string>
+    <string name="layout_item_tag">活潑</string>
 
     <string name="layout_bottom_list_tips1">取消</string>
 
-    <string name="layout_bend_call_tips1">关注</string>
-    <string name="layout_bend_call_tips2">此次通话结束了快开启\n下一次通话吧</string>
-    <string name="layout_bend_call_tips3">再次通话</string>
+    <string name="layout_bend_call_tips1">關注</string>
+    <string name="layout_bend_call_tips2">此次通話結束了快開啟\n下一次通話吧</string>
+    <string name="layout_bend_call_tips3">再次通話</string>
     <string name="layout_bend_call_tips4">去充值</string>
 
-    <string name="layout_msg_more_tips1">打招呼设置</string>
-    <string name="layout_msg_more_tips2">一键已读</string>
+    <string name="layout_msg_more_tips1">打招呼設置</string>
+    <string name="layout_msg_more_tips2">一鍵已讀</string>
 
-    <string name="layout_friends_tips1">推荐</string>
-    <string name="layout_friends_tips2">热门</string>
+    <string name="layout_friends_tips1">推薦</string>
+    <string name="layout_friends_tips2">熱門</string>
 
-    <string name="layout_home_ranking_tips1">关注</string>
+    <string name="layout_home_ranking_tips1">關注</string>
 
     <string name="layout_f_msg_tips1">消息</string>
     <string name="layout_f_msg_tips2">好友</string>
 
     <string name="layout_f_my_tips1">用戶名稱</string>
-    <string name="layout_f_my_tips2">这个人很懒，什么也没留下。</string>
+    <string name="layout_f_my_tips2">這個人很懶，什麼也沒留下。</string>
 
-    <string name="layout_i_greet_config_tips1">请输入文案</string>
+    <string name="layout_i_greet_config_tips1">請輸入文案</string>
 
     <string name="layout_i_sys_msg_tips1">點擊查看</string>
 
     <string name="layout_call_input_tips1">輸入信息</string>
     <string name="layout_f_system_tips1">聯繫客服</string>
-    <string name="layout_v_empty_list_tips1">没有找到匹配结果~</string>
+    <string name="layout_v_empty_list_tips1">沒有找到匹配結果~</string>
 
     <string name="layout_d_msg_chat_auth_tips1">對方邀請您完成真人認證，開通通話權限</string>
-    <string name="layout_d_msg_chat_auth_tips2">去开通</string>
+    <string name="layout_d_msg_chat_auth_tips2">去開通</string>
 
     <string name="layout_d_msg_gift_tips1">送給你</string>
 
     <string name="layout_d_send_gift_tips1">充值</string>
 
-    <string name="layout_d_msg_bar_tips1">查看主页</string>
+    <string name="layout_d_msg_bar_tips1">查看主頁</string>
 
     <string name="layout_v_greet_config_add_tips1">添加更多</string>
     <string name="layout_v_custom_tips1">保存</string>
-    <string name="activity_my_friend_list_fans">被關註</string>
+    <string name="activity_my_friend_list_fans">被關注</string>
     <string name="activity_my_friend_list_follow">關注</string>
-    <string name="activity_my_friend_list_friend">互動關註</string>
+    <string name="activity_my_friend_list_friend">互動關注</string>
     <string name="activity_my_friend_list_people">人</string>
 
-    <string name="activity_my_friend_list_item_0">未關註</string>
+    <string name="activity_my_friend_list_item_0">未關注</string>
     <string name="activity_my_friend_list_item_1">回關</string>
     <string name="activity_my_friend_list_item_2">已關注</string>
     <string name="activity_my_friend_list_item_3">相互關注</string>
@@ -260,4 +260,7 @@
     <string name="activity_my_friend_fans">粉絲</string>
     <string name="activity_my_friend_follow">關注</string>
     <string name="activity_my_friend_friend">好友</string>
+
+    <string name="dialog_call_prop_apply">收下獎勵</string>
+    <string name="toast_call_not_unlock">發送任意禮物后即可解鎖</string>
 </resources>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/values/strings.xml b/OneToOne/src/main/res/values/strings.xml
index 13c0dc2bc..3d6c38e22 100644
--- a/OneToOne/src/main/res/values/strings.xml
+++ b/OneToOne/src/main/res/values/strings.xml
@@ -262,4 +262,7 @@
     <string name="activity_my_friend_fans">粉絲</string>
     <string name="activity_my_friend_follow">關注</string>
     <string name="activity_my_friend_friend">好友</string>
+
+    <string name="dialog_call_prop_apply">收下獎勵</string>
+    <string name="toast_call_not_unlock">發送任意禮物后即可解鎖</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/java/com/yunbao/common/http/ResponseModel.java b/common/src/main/java/com/yunbao/common/http/ResponseModel.java
index d03cb4ce2..7b2521f60 100644
--- a/common/src/main/java/com/yunbao/common/http/ResponseModel.java
+++ b/common/src/main/java/com/yunbao/common/http/ResponseModel.java
@@ -1,5 +1,6 @@
 package com.yunbao.common.http;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
@@ -56,6 +57,9 @@ public class ResponseModel<T> {
     public String getJsonSrc() {
         return jsonSrc;
     }
+    public JSONObject getSrcJSONOBject() {
+        return JSONObject.parseObject(jsonSrc);
+    }
 
     public boolean isError() {
         return data == null;
diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
index ae27de871..706e17bea 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
@@ -47,6 +47,7 @@ public class RongcloudIMManager {
         } else {
             RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key
         }
+        RONG_IM_KEY="lmxuhwagl7s1d";
     }
 
     /**
diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
index 2b3ef2ea1..7ee6c3edc 100644
--- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
+++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
@@ -550,28 +550,32 @@ public class JavascriptInterfaceUtils {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("clickLogOffAccount"));
     }
+
     @JavascriptInterface
-    public void androidFansGroupBuy(String id){
+    public void androidFansGroupBuy(String id) {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("androidFansGroupBuy").setUserId(id));
     }
+
     @JavascriptInterface
-    public void androidFansGroupPack(){
+    public void androidFansGroupPack() {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("androidFansGroupPack"));
     }
+
     @JavascriptInterface
-    public void androidFansGroupInfo(){
+    public void androidFansGroupInfo() {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("androidFansGroupInfo"));
     }
 
     @JavascriptInterface
-    public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl,int isAnchor   ) {
-        RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0,isAnchor==1);
+    public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl, int isAnchor) {
+        RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0, isAnchor == 1);
     }
+
     @JavascriptInterface
-    public void wearOrCancelFanMedal(){
+    public void wearOrCancelFanMedal() {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
@@ -587,9 +591,15 @@ public class JavascriptInterfaceUtils {
                     }
                 });
     }
+
     @JavascriptInterface
-    public void androidCancelAnchorAttention(){
+    public void androidCancelAnchorAttention() {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("androidCancelAnchorAttention"));
     }
+
+    @JavascriptInterface
+    public void androidCallChat(String targetId) {
+        ToastUtil.show("网页触发聊一聊：" + targetId);
+    }
 }