修改json 格式

陈硕
1 parent c162866b
Showing 10 changed files with 184 additions and 126 deletions
app/src/main/java/com/cnlive/gundam/main/utils/ToStringUtils.java
app/src/main/java/com/cnlive/gundam/user/util/InputUtil.java
app/src/main/java/com/cnlive/gundam/video/adpter/GiftAdapter.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/MessageContentInfo.java
app/src/main/java/com/cnlive/gundam/video/model/CNMessageModle.java
app/src/main/java/com/cnlive/gundam/video/model/MessageInfo.java
app/src/main/java/com/cnlive/gundam/video/view/PlayerControllerView.java
app/src/main/res/layout/fragment_player_ugc_live.xml
app/src/main/res/layout/layout_player_controller_ugc_live_l.xml
-package com.cnlive.gundam.main.utils;
-
-
-import com.cnlive.libs.util.chat.base.IChat;
-
-/**
- * @author 陈硕
- * @time 2017/3/28  10:20
- * @desc ${TODD}
- */
-public class ToStringUtils {
-
-    public static String GiftType = "giftType";
-    public static String ChatRoomype = IChat.CHATROOM;
-    public static String PrivateType = IChat.PRIVATE;
-    public static String JoinType = "JOINTYPE";
-
-
-    public static String objToJsonString(CNMessageModole cnMessageModole) {
-
-        // 初始化返回值
-        String json = "str_empty";
-
-        if (cnMessageModole == null) {
-            return json;
-        }
-
-        StringBuilder buff = new StringBuilder();
-        buff.append("{");
-        buff.append("message");
-        buff.append(":");
-        buff.append("\"");
-        buff.append(cnMessageModole.getMessage() == null ? "" : cnMessageModole.getMessage());
-        buff.append("\"");
-        buff.append(",");
-        buff.append("type");
-        buff.append(":");
-        buff.append("\"");
-        buff.append(cnMessageModole.getType() == null ? "" : cnMessageModole.getType());
-        buff.append("\"");
-        buff.append("}");
-        json = buff.toString();
-        return json;
-    }
-
-    public static class CNMessageModole {
-
-
-        public CNMessageModole(String message, String type) {
-            this.message = message;
-            this.type = type;
-        }
-
-        /**
-         * message : Sass
-         *
-         * type : 2
-         */
-
-        private String message;
-        private String type;
-
-        public String getMessage() {
-            return message;
-        }
-
-        public void setMessage(String message) {
-            this.message = message;
-        }
-
-
-        public String getType() {
-            return type;
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-    }
-
-}
@@ -16,7 +16,8 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import com.cnlive.gundam.R;
-import com.cnlive.gundam.main.utils.ToStringUtils;
+import com.cnlive.gundam.video.model.CNMessageModle;
+import com.cnlive.gundam.video.model.MessageInfo;
 import com.google.gson.Gson;
 /**
@@ -114,10 +115,9 @@ public class InputUtil {
         if (TextUtils.isEmpty(mMsgEditText.getText())) {
             ToastUtil.showToast(mContext, "不能发送空消息呦~");
         } else {
-            if(mSendCallback!=null) mSendCallback.sendMessage(mGson.toJson(new ToStringUtils.CNMessageModole(mMsgEditText.getText().toString(), ToStringUtils.ChatRoomype)));
+            if(mSendCallback!=null) mSendCallback.sendMessage(mGson.toJson(new CNMessageModle("chatRoom",new MessageInfo("","","","",mMsgEditText.getText().toString()))));
             mMsgEditText.setText("");
         }
-
         if (mInputPopupWindow != null && mInputPopupWindow.isShowing()) mInputPopupWindow.dismiss();
     }
@@ -10,11 +10,13 @@ import android.view.ViewGroup;
 import android.widget.Toast;
 import com.cnlive.gundam.R;
-import com.cnlive.gundam.main.utils.ToStringUtils;
+import com.cnlive.gundam.video.model.CNMessageModle;
 import com.cnlive.gundam.video.model.GiftModle;
+import com.cnlive.gundam.video.model.MessageInfo;
 import com.cnlive.libs.util.chat.ChatUtil;
 import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNMessage;
+import com.google.gson.Gson;
 import java.util.List;
@@ -55,9 +57,10 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
         holder.binding.getRoot().findViewById(R.id.ll_item).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String objToJsonString = ToStringUtils.objToJsonString(new ToStringUtils.CNMessageModole(mDataList.get(position).getGiftMessage(), ToStringUtils.GiftType));
-//
-                ChatUtil.sendMessage(IChat.CHATROOM, roomId, objToJsonString, new IChat.OnSendMessageListener() {
+                CNMessageModle cnMessageModle = new CNMessageModle("giftType",new MessageInfo("0",mDataList.get(position).getGiftMessage(),"1","0",mDataList.get(position).getGiftMessage()));
+                Gson gson2=new Gson();
+                String obj2=gson2.toJson(cnMessageModle);
+                ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, new IChat.OnSendMessageListener() {
                     @Override
                     public void onAttached(CNMessage message) {
@@ -83,6 +83,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+
     private void barrageBottom() {
         switchCompatBottom = fragmentChatBinding.barrage;
         switchCompatBottom.setChecked(false);
@@ -139,11 +140,14 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @Override
     public void onDestroy() {
         super.onDestroy();
+        Log.v("fdfsfaf","dfasdfsafdfadf");
         ChatUtil.disconnect(false);
     }
+
+
     private void initChat() {
         User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
         String faceurl = activeAccountInfo.getFaceurl();
@@ -218,6 +222,9 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+
+
+
     public  void  doBarrage(){
         boolean isPortrait = PlayerUtils.isPortrait(getActivity());
         final BarrageLayout barrageLayout = getActivity().findViewById(R.id.private_message);
@@ -233,7 +240,6 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
                         @Override
                         public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                             if (b) {
-                                Log.v("fsdas","fasdf");
                                 barrageLayout.resume();
                             } else {
@@ -3,18 +3,18 @@ package com.cnlive.gundam.video.fragment.chat;
 import android.content.Context;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.util.Log;
-import com.cnlive.gundam.main.utils.ToStringUtils;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.video.barrage.BarrageBaseMessage;
+import com.cnlive.gundam.video.model.CNMessageModle;
 import com.cnlive.gundam.video.model.MessageContent;
+import com.cnlive.gundam.video.model.MessageInfo;
 import com.cnlive.libs.util.chat.ChatUtil;
 import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNMessage;
 import com.cnlive.libs.video.barrage.BarrageLayout;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.google.gson.Gson;
 import java.util.ArrayList;
@@ -35,6 +35,9 @@ public class MessageContentInfo {
     private SendAndRecevieSucessCall mSendAndRecevieSucessCall;
     private String roomId;
     private  BarrageLayout barrageLayout;
+    private String JoinType = "joinType";
+    private  String  ChatRoom ="chatRoom";
+    private  String  giftType = "giftType";
     public void setOnReceiveAndSendListener(BarrageLayout   barrageLayout,String roomID, Context context, SendAndRecevieSucessCall sendAndRecevieSucessCall) {
@@ -60,15 +63,18 @@ public class MessageContentInfo {
                     @Override
                     public void run() {
                         try {
-                            JSONObject jsonObject = new JSONObject(message.getContent().toString());
-                            String type = (String) jsonObject.get("type");
-                            String messagecontent = (String) jsonObject.get("message");
-                            if (type.equals(ToStringUtils.GiftType)) {
+                            Gson gson = new Gson();
+                            CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
+                            String messagecontent =cnMessageModle.getMessage().getContent();
+                            String messageType = cnMessageModle.getType();
+
+
+                            if (messageType.equals(giftType)) {
                                 barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "送了" + messagecontent, ""));
                                 messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": 送了" + messagecontent, message.getUserInfo().getHeadUrl(), true));
-                            } else if (type.equals(ToStringUtils.ChatRoomype)) {
+                            } else if (messageType.equals(ChatRoom)) {
                                 if (message.getUserInfo().getUserId().equals(ChatUtil.getCurrentUserInfo().getUserId())) {
                                     messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " :", message.getUserInfo().getHeadUrl(), false));
                                 } else {
@@ -78,7 +84,7 @@ public class MessageContentInfo {
                                 barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
-                            } else if (type.equals(ToStringUtils.JoinType)) {
+                            } else if (messageType.equals(JoinType)) {
                                 String userName = message.getUserInfo().getUserName();
                                 if (TextUtils.isEmpty(userName)) {
                                     return;
@@ -86,15 +92,15 @@ public class MessageContentInfo {
                                 if (userName.equals(UserService.getInstance(mContext).getActiveAccountInfo().getNickname())) {
                                     return;
                                 }
-                                barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
+                                barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "来了", ""));
-                                messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": " + messagecontent, message.getUserInfo().getHeadUrl(), true));
+                                messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": " + "来了", message.getUserInfo().getHeadUrl(), true));
                             }
                             mSendAndRecevieSucessCall.receaviceSucess(messageContentArrayList);
-                        } catch (JSONException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                     }
@@ -113,12 +119,15 @@ public class MessageContentInfo {
             @Override
             public void onSuccess(CNMessage message) {
-                JSONObject jsonObject = null;
                 try {
-                    jsonObject = new JSONObject(message.getContent().toString());
-                    String messagecontent = (String) jsonObject.get("message");
-                    String messageType = (String) jsonObject.get("type");
-                    if (messageType.equals(ToStringUtils.ChatRoomype)) {
+
+                    Gson gson = new Gson();
+                    CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
+                    String messagecontent =cnMessageModle.getMessage().getContent();
+                    String messageType = cnMessageModle.getType();
+
+
+                    if (messageType.equals(ChatRoom)) {
                         barrageLayout.addMessage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
                         messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " :", message.getUserInfo().getHeadUrl(), false));
@@ -126,7 +135,7 @@ public class MessageContentInfo {
                         mSendAndRecevieSucessCall.sentSucess(messageContentArrayList);
                     }
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -166,10 +175,11 @@ public class MessageContentInfo {
         ChatUtil.joinChatRoom(roomId, 0, new IChat.OnOperationListener() {
             @Override
             public void onSuccess(int what, String extra) {
-
-
-                String objToJsonString = ToStringUtils.objToJsonString(new ToStringUtils.CNMessageModole("加入聊天室", ToStringUtils.JoinType));
-                ChatUtil.sendMessage(IChat.CHATROOM, roomId, objToJsonString, onSendMessageListener);
+                CNMessageModle  cnMessageModle = new CNMessageModle(JoinType,new MessageInfo("","","","",""));
+                Gson gson2=new Gson();
+                String obj2=gson2.toJson(cnMessageModle);
+                Log.v("dfsd",obj2);
+                ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, onSendMessageListener);
             }
             @Override
+package com.cnlive.gundam.video.model;
+
+/**
+ * @author 陈硕
+ * @time 2017/6/30  10:20
+ * @desc ${TODD}
+ */
+public class CNMessageModle {
+
+   /* {
+        "type" : "giftType",//"chatRoom"//"joinType"
+            "message" : {
+        "giftPrice" : "0",
+                "giftName" : "小黄瓜",
+                "giftNumber" : "1",
+                "messageBarrage" : "0",
+                "content" : "聊天内容"
+    }
+    }*/
+
+    private String type;
+    private MessageInfo message;
+
+    @Override
+    public String toString() {
+        return "CNMessageModle{" +
+                "type='" + type + '\'' +
+                ", message=" + message +
+                '}';
+    }
+
+    public CNMessageModle(String type, MessageInfo message) {
+        this.type = type;
+        this.message = message;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public MessageInfo getMessage() {
+        return message;
+    }
+
+    public void setMessage(MessageInfo message) {
+        this.message = message;
+    }
+
+
+
+}
+package com.cnlive.gundam.video.model;
+
+/**
+ * @author 陈硕
+ * @time 2017/6/30  10:34
+ * @desc ${TODD}
+ */
+public class MessageInfo {
+
+        private String giftPrice;
+        private String giftName;
+
+        private String giftNumber;
+        private String messageBarrage;
+
+        private String content;
+
+        public MessageInfo(String giftPrice, String giftName, String giftNumber, String messageBarrage, String content) {
+            this.giftPrice = giftPrice;
+            this.giftName = giftName;
+            this.giftNumber = giftNumber;
+            this.messageBarrage = messageBarrage;
+            this.content = content;
+        }
+
+        @Override
+        public String toString() {
+            return "MessageInfo{" +
+                    "giftPrice='" + giftPrice + '\'' +
+                    ", giftName='" + giftName + '\'' +
+                    ", giftNumber='" + giftNumber + '\'' +
+                    ", messageBarrage='" + messageBarrage + '\'' +
+                    ", content='" + content + '\'' +
+                    '}';
+        }
+
+        public String getGiftPrice() {
+            return giftPrice;
+        }
+
+        public void setGiftPrice(String giftPrice) {
+            this.giftPrice = giftPrice;
+        }
+
+        public String getGiftName() {
+            return giftName;
+        }
+
+        public void setGiftName(String giftName) {
+            this.giftName = giftName;
+        }
+
+        public String getGiftNumber() {
+            return giftNumber;
+        }
+
+        public void setGiftNumber(String giftNumber) {
+            this.giftNumber = giftNumber;
+        }
+
+        public String getMessageBarrage() {
+            return messageBarrage;
+        }
+
+        public void setMessageBarrage(String messageBarrage) {
+            this.messageBarrage = messageBarrage;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+    }
+
@@ -22,7 +22,6 @@ import android.widget.SeekBar;
 import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.LayoutPlayerControllerLiveLBinding;
-import com.cnlive.gundam.databinding.LayoutPlayerControllerUgcLiveLBinding;
 import com.cnlive.gundam.video.utils.PlayerUtils;
 import com.cnlive.gundam.video.utils.VideoRateUtil;
 import com.cnlive.libs.util.Config;
@@ -224,7 +223,6 @@ public class PlayerControllerView extends RelativeLayout implements SeekBar.OnSe
                 this.binding.setVariable(BR.title, observableTitle);
                 this.binding.setVariable(BR.showController, observableShow);
                 this.binding.setVariable(BR.isPlay, observableIsPlay);
-                if(switchCompatChangeListener!=null)switchCompatChangeListener.onSwitchCompatChange(((LayoutPlayerControllerUgcLiveLBinding) this.binding).barrageTop);
                 isUgc = true;
                 break;
         }
@@ -23,6 +23,7 @@
         <RelativeLayout
             android:id="@+id/contentLayout"
+            android:paddingTop="100dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentBottom="true">
@@ -78,18 +78,6 @@
                 android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}" />
-            <android.support.v7.widget.SwitchCompat
-                android:id="@+id/barrage_top"
-                android:layout_marginRight="50dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:background="@null"
-                android:textIsSelectable="false"
-                android:layout_alignParentRight="true"
-                android:thumb="@drawable/switch_thumb"
-                app:switchMinWidth="30dp"
-                app:track="@drawable/switch_track" />
         </RelativeLayout>