v1.0-2

修复支付链接问题
修复动态进个人主页无法聊一聊问题
修复支付页面【充值未到账】位置错误问题

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"));

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"));

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;
+    }
 }