From 5f107fef251453aa548f7b5db791d3009b5f7463 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 27 Jul 2024 11:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=B0=91=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=95=B0=E7=BB=84=E4=B8=8B?=
 =?UTF-8?q?=E6=A0=87=E8=B6=8A=E7=95=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbsMainMessageChatListFragment.java       | 21 ++++++++++++-------
 .../yunbao/common/http/CommonHttpUtil.java    |  6 ++++++
 config.gradle                                 |  2 +-
 .../live/dialog/LiveUserDialogFragment.java   |  7 +++++++
 .../main/activity/UserHomeActivity.java       | 15 +++++++++----
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java b/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
index e17e9d1af..41f81862a 100644
--- a/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
@@ -46,9 +46,9 @@ import io.rong.imlib.model.UserInfo;
 
 public abstract class AbsMainMessageChatListFragment extends Fragment {
     private static final String TAG = "全部聊天";
-   public RecyclerView recyclerView;
-    public  MainConversationListAdapter mAdapter;
-    public  SmartRefreshLayout refreshLayout;
+    public RecyclerView recyclerView;
+    public MainConversationListAdapter mAdapter;
+    public SmartRefreshLayout refreshLayout;
 
     public void setAdapter(MainConversationListAdapter mAdapter) {
         this.mAdapter = mAdapter;
@@ -136,7 +136,7 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
                 });
     }
 
-    public void loadLiveOnlineStatus(List<BaseUiConversation> srcList, OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener){
+    public void loadLiveOnlineStatus(List<BaseUiConversation> srcList, OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener) {
         List<String> uids = new ArrayList<>();
         isNet = true;
         for (BaseUiConversation conversation : srcList) {
@@ -148,10 +148,17 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
         CommonHttpUtil.getUserOnline(String.join(",", uids), new com.yunbao.common.http.HttpCallback() {
             @Override
             public void onSuccess(int code, String msg, String[] info) {
-                if(code==0&&info!=null){
+                if (code == 0 && info != null) {
                     List<MsgOnlineStatusBean> listUserBean = JSON.parseArray(Arrays.toString(info), MsgOnlineStatusBean.class);
-                    for (int i = 0; i <srcList.size(); i++) {
-                        srcList.get(i).mCore.setDraft(listUserBean.get(i).getOnline());
+                    for (int i = 0; i < srcList.size(); i++) {
+                        for (int j = 0; j < listUserBean.size(); j++) {
+                            if (!StringUtil.isEmpty(srcList.get(i).mCore.getTargetId()) &&
+                                    srcList.get(i).mCore.getTargetId().equals(listUserBean.get(j).getId())) {
+                                srcList.get(i).mCore.setDraft(listUserBean.get(j).getOnline());
+                                break;
+                            }
+                        }
+
                     }
                     onRefreshListener.onFinish(srcList);
                     isNet = false;
diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
index 9b6b8d3f0..bcfc0e1e9 100644
--- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
@@ -705,6 +705,12 @@ public class CommonHttpUtil {
                 .params("behavior_type","5")
                 .execute(callback);
     }
+    public static void sayHi(String toUid,String type,HttpCallback callback) {
+        HttpClient.getInstance().get("Pdluser.liveCall", "Pdluser.liveCall")
+                .params("target_uid",toUid)
+                .params("behavior_type",type)
+                .execute(callback);
+    }
 
     /**
      *获取聊天列表用户在线状态
diff --git a/config.gradle b/config.gradle
index 66f4bf4f3..54f30299f 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 538,
+            versionCode      : 539,
             versionName      : "6.7.2",
             namespace        : "com.pandoralive.shayu"
     ]
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
index 1deb21138..124800d2d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
@@ -762,6 +762,13 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
                 showMsgError();
                 return;
             }
+            boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C");
+            CommonHttpUtil.sayHi(mToUid, isAnchor ? "6" : "7",new HttpCallback() {
+                @Override
+                public void onSuccess(int code, String msg, String[] info) {
+
+                }
+            });
             EventBus.getDefault().post(new MainHomeCommunityToChatEvent().setTargetId(mToUid));
         }
     }
diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
index 527544e9d..a3a890db7 100644
--- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
@@ -589,7 +589,7 @@ public class UserHomeActivity extends AbsActivity {
         communityRecyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
 
         msgLayout = findViewById(R.id.msgLayout);
-        msgLayout.setVisibility(uid.equals(CommonAppConfig.getInstance().getUid())?View.GONE:View.VISIBLE);
+        msgLayout.setVisibility(uid.equals(CommonAppConfig.getInstance().getUid()) ? View.GONE : View.VISIBLE);
         msgLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -610,6 +610,13 @@ public class UserHomeActivity extends AbsActivity {
                     showMsgError();
                     return;
                 }
+                boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C");
+                CommonHttpUtil.sayHi(String.valueOf(userInfo.getUserHomeTopInfo().getUser_id()), isAnchor ? "6" : "7", new com.yunbao.common.http.HttpCallback() {
+                    @Override
+                    public void onSuccess(int code, String msg, String[] info) {
+
+                    }
+                });
                 EventBus.getDefault().post(new MainHomeCommunityToChatEvent().setTargetId(String.valueOf(userInfo.getUserHomeTopInfo().getUser_id())));
             }
         });
@@ -655,7 +662,7 @@ public class UserHomeActivity extends AbsActivity {
                             liveBean.setParams(gotoRoomKey);
                             new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                                 @Override
-                                public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
+                                public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
                                     if (StringUtil.isEmpty(liveUid)) {
                                         return;
                                     }
@@ -663,7 +670,7 @@ public class UserHomeActivity extends AbsActivity {
                                     if (AppManager.getInstance().getLiveActivity() != null) {
                                         EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
                                     } else {
-                                        RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk),isSw);
+                                        RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk), isSw);
                                     }
                                 }
 
@@ -843,7 +850,7 @@ public class UserHomeActivity extends AbsActivity {
     }
 
     public void showMsgError() {
-        ToastUtil.show(WordUtil.isNewZh()?"無法聊天,待開發":"Unable to chat, awaiting development");
+        ToastUtil.show(WordUtil.isNewZh() ? "無法聊天,待開發" : "Unable to chat, awaiting development");
     }