From 73cdf9ca4328c7030e30e6f8bb26e621dc119225 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 10 Nov 2023 18:12:07 +0800
Subject: [PATCH] =?UTF-8?q?v1.0-2=20=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=BF=9B=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=81=8A=E4=B8=80=E8=81=8A=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=90=E5=85=85=E5=80=BC=E6=9C=AA=E5=88=B0=E8=B4=A6=E3=80=91?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/shayu/onetoone/AppContext.java   |  8 ++++-
 .../java/com/shayu/phonelive/AppContext.java  |  2 +-
 .../common/bean/AnchorStartLiveBean.java      | 31 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java b/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
index c5a0fb6ec..e2f78530d 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/AppContext.java
@@ -241,6 +241,12 @@ public class AppContext extends CommonAppContext {
                                 SocketReceiveBean received = JSON.parseObject(content.getContent(), SocketReceiveBean.class);
                                 JSONObject map = received.getMsg().getJSONObject(0);
                                 sendStartAnchorLive(map);
+                            }else if(content.getContent().contains("Chat_messageNotify")){
+                                //TODO 各种通知
+                            }else if(content.getContent().contains("Chat_callAudioNotify")){
+
+                            }else if(content.getContent().contains("Chat_callVideoNotify")){
+
                             }
                             //主播页面
                             if (TextUtils.isEmpty(PortraitLiveManager.liveID) && SocketRyClient.mSocketHandler != null) {
@@ -258,7 +264,7 @@ public class AppContext extends CommonAppContext {
             }
 
             private void sendStartAnchorLive(JSONObject map) {
-                AnchorStartLiveBean bean = new AnchorStartLiveBean();
+                AnchorStartLiveBean bean = new AnchorStartLiveBean(AnchorStartLiveBean.TYPE_LIVE);
                 bean.setAnchorName(map.getString("anchorName"));
                 bean.setRoomId(map.getString("roomid"));
                 bean.setAvatar(map.getString("avatar"));
diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java
index d26bdc5a8..50480566f 100644
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -237,7 +237,7 @@ public class AppContext extends CommonAppContext {
             }
 
             private void sendStartAnchorLive(JSONObject map) {
-                AnchorStartLiveBean bean = new AnchorStartLiveBean();
+                AnchorStartLiveBean bean = new AnchorStartLiveBean(AnchorStartLiveBean.TYPE_LIVE);
                 bean.setAnchorName(map.getString("anchorName"));
                 bean.setRoomId(map.getString("roomid"));
                 bean.setAvatar(map.getString("avatar"));
diff --git a/common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java b/common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java
index da5761653..fb3937eae 100644
--- a/common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java
@@ -8,6 +8,13 @@ public class AnchorStartLiveBean extends BaseModel{
     private String anchorName;
     private String avatar;
     private String roomId;
+    private int type;
+    private String targetId;
+    private String content;
+
+    public AnchorStartLiveBean(int type) {
+        this.type = type;
+    }
 
     public String getAnchorName() {
         return anchorName;
@@ -32,4 +39,28 @@ public class AnchorStartLiveBean extends BaseModel{
     public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
 }