Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp

朱显松
2 parents 97a79de3 abfdfe1a
Showing 9 changed files with 88 additions and 68 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/stream/ui/activity/StreamActivity.java
app/src/main/java/com/cnlive/gundam/stream/ui/adapter/SimpleAdapter.java
app/src/main/java/com/cnlive/gundam/user/activity/LoginActivity.java
app/src/main/java/com/cnlive/gundam/video/adpter/CommonAdapter.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/res/layout/item_toolbar.xml
@@ -8,7 +8,6 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.cnlive.gundam.R;
@@ -49,8 +48,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     }
     private void initUI() {
-        TextView titleText = binding.getRoot().findViewById(R.id.toobar_tv);
-        if (titleText != null) titleText.setText("我 的");
+        binding.toobar.toobarTv.setText("我 的");
         binding.configHeader.setOnClickListener(this);
         binding.message.setOnClickListener(this);
     }
@@ -103,8 +103,8 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         showView.setChatView(false);
         showView.setViewers(false);
         binding.setIsShow(showView);
-        binding.chatRecyclerView.setLayoutManager(new LinearLayoutManager(this));
         chatItemList = new ArrayList<>();
+        initChatRoomRecycel();
         timerUtil = new TimerUtil(this);
         accelerometerSensor = new AccelerometerSensor(this);
@@ -123,6 +123,13 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         orientationChange();
     }
+    private void initChatRoomRecycel() {
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setStackFromEnd(true);
+        binding.chatRecyclerView.setLayoutManager(linearLayoutManager);
+        chatAdapter = new SimpleAdapter(this,  R.layout.item_chat, com.cnlive.gundam.BR.chat);
+    }
+
     private void initData() {
         activityId = getIntent().getStringExtra("activityId");
         channelId = getIntent().getStringExtra("channelId");
@@ -427,8 +434,10 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
         } catch (Exception e) {
             e.printStackTrace();
         }
-        chatAdapter = new SimpleAdapter(this, chatItemList, R.layout.item_chat, com.cnlive.gundam.BR.chat);
+
+        chatAdapter.addItems(chatItemList);
         binding.setChatAdapter(chatAdapter);
+
     }
     private void getOnlinePerson() {
@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -21,13 +22,18 @@ public class SimpleAdapter&lt;T&gt; extends RecyclerView.Adapter&lt;SimpleAdapter.ViewHol
     private int variableId;
-    public SimpleAdapter(Context mContext, List<T> activeInfoList, int layoutId, int variableId) {
+    public SimpleAdapter(Context mContext, int layoutId, int variableId) {
         this.mContext = mContext;
-        this.activeInfoList = activeInfoList;
+        if(activeInfoList==null){this.activeInfoList = new ArrayList<>();}
         this.layoutId = layoutId;
         this.variableId = variableId;
     }
+    public void addItems(List<T> items){
+        if(items == null) return ;
+        this.activeInfoList=items;
+    }
+
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         LayoutInflater inflater = LayoutInflater.from(parent.getContext());
 package com.cnlive.gundam.user.activity;
-import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.user.auth.AccountAuthenticatorActivity;
 import com.cnlive.gundam.user.fragment.LoginFragment;
-import com.cnlive.gundam.user.util.DevilUtil;
 /**
@@ -26,20 +21,4 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         getSupportFragmentManager().beginTransaction().replace(R.id.login_fragment, LoginFragment.newInstance()).commit();
     }
-    /**
-     * 隐藏软键盘
-     */
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev){
-        // TODO Auto-generated method stub
-        if(ev.getAction()== MotionEvent.ACTION_DOWN){
-
-            View v=getCurrentFocus();
-            if(DevilUtil.isShouldHideInput(v,ev)){
-                InputMethodManager im=(InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-                DevilUtil.hideSoftInput(v.getWindowToken(),im);
-            }
-        }
-        return super.dispatchTouchEvent(ev);
-    }
 }
@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
 import com.cnlive.gundam.databinding.ItemListRightBinding;
 import com.cnlive.gundam.video.model.MessageContent;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -29,12 +30,17 @@ public class CommonAdapter&lt;T&gt; extends BaseAdapter {
         this.mContext = context;
         this.layoutId = layoutId;
         this.variableId = variableId;
+        this.mDataList= new ArrayList<>();
     }
-    public  void  setDataList(List<T> dataList){
-        this.mDataList= dataList;
+    public void addItems(List<T> items){
+        if(items == null) return ;
+        this.mDataList=items;
+        notifyDataSetChanged();
     }
+
+
     @Override
     public int getCount() { return mDataList.size(); }
@@ -7,9 +7,10 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.video.activity.PlayerActivity;
+import com.cnlive.gundam.video.fragment.chat.ChatRoomFragment;
 import com.cnlive.gundam.video.model.CNMessageModle;
 import com.cnlive.gundam.video.model.GiftModle;
 import com.cnlive.gundam.video.model.MessageInfo;
@@ -52,7 +53,7 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
     }
     @Override
-    public void onBindViewHolder(RVHolder holder, final int position) {
+    public void onBindViewHolder(final RVHolder holder, final int position) {
         holder.binding.setVariable(mVariableId, mDataList.get(position));
         holder.binding.getRoot().findViewById(R.id.ll_item).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -68,7 +69,10 @@ public class GiftAdapter extends RecyclerView.Adapter&lt;GiftAdapter.RVHolder&gt; {
                     @Override
                     public void onSuccess(CNMessage message) {
-                        Toast.makeText(mContext,mDataList.get(position).getGiftMessage(),Toast.LENGTH_SHORT).show();
+                        PlayerActivity context = (PlayerActivity) GiftAdapter.this.mContext;
+
+                        ChatRoomFragment chatRoomFragment = (ChatRoomFragment) context.getSupportFragmentManager().findFragmentByTag("chatRoomFragment");
+                        chatRoomFragment.giftItem(position);
                     }
@@ -8,11 +8,13 @@ import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.SwitchCompat;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.cnlive.gundam.BR;
@@ -43,7 +45,7 @@ import java.util.ArrayList;
  */
 public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback, MessageContentInfo.SendAndRecevieSucessCall {
-
+    PlayerControllerView.SwitchCompatChangeListener switchCompatChangeListener;
     private FragmentChatBinding fragmentChatBinding;
     private ArrayList<GiftModle> giftArray;
     private CommonAdapter<MessageContent> messageContentCommonAdapter;
@@ -51,6 +53,8 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     public SwitchCompat switchCompatBottom;
     private BarrageLayout barrageLayout;
     private String roomId;
+    private int[] imaSource;
+    private String[] gitName;
     public static ChatRoomFragment newInstance(String id ) {
@@ -71,7 +75,6 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
-    PlayerControllerView.SwitchCompatChangeListener switchCompatChangeListener;
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -126,15 +129,12 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @Override
     public void sentSucess(ArrayList<MessageContent> messageContents) {
-
-        messageContentCommonAdapter.setDataList((messageContents));
-        ChatRoomFragment.this.fragmentChatBinding.setMessageAdapter(messageContentCommonAdapter);
+        messageContentCommonAdapter.addItems((messageContents));
     }
     @Override
     public void receaviceSucess(ArrayList<MessageContent> messageContents) {
-        messageContentCommonAdapter.setDataList((messageContents));
-        ChatRoomFragment.this.fragmentChatBinding.setMessageAdapter(messageContentCommonAdapter);
+        messageContentCommonAdapter.addItems((messageContents));
     }
@@ -144,10 +144,6 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         ChatUtil.disconnect(false);
     }
-
-
-
-
     private void initChat() {
         User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
         String faceurl = activeAccountInfo.getFaceurl();
@@ -165,6 +161,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     private void initMessageAdapter() {
         if (messageContentCommonAdapter == null)
             messageContentCommonAdapter = new CommonAdapter<>(getActivity(), R.layout.item_list_right, BR.user);
+        ChatRoomFragment.this.fragmentChatBinding.setMessageAdapter(messageContentCommonAdapter);
     }
@@ -184,13 +181,13 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     private void initDate() {
-        int[] imaSource = new int[]{R.drawable.porsch_small80, R.drawable.fighter_small80,
+        imaSource = new int[]{R.drawable.porsch_small80, R.drawable.fighter_small80,
                 R.drawable.plane_small80,
                 R.drawable.beer, R.drawable.chicken,
                 R.drawable.cucumber, R.drawable.flower,
                 R.drawable.hug, R.drawable.mouth,
                 R.drawable.ring, R.drawable.rose, R.drawable.continuous};
-        String[] gitName = new String[]{"跑车", "歼灭机", "飞机", "啤酒",
+        gitName = new String[]{"跑车", "歼灭机", "飞机", "啤酒",
                 "小鸡", "小黄瓜", "鲜花", "抱抱", "亲吻", "戒指", "玫瑰花", "荧光棒"};
         giftArray = new ArrayList<>();
         for (int i = 0; i < 12; i++) {
@@ -256,4 +253,15 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+    public  void  giftItem(int postion){
+        Toast.makeText(getActivity(),gitName[postion],Toast.LENGTH_SHORT).show();
+        Log.d("giftItem", "giftItem: " +gitName[postion]);
+        int i = imaSource[postion];
+
+
+
+
+    }
+
+
 }
@@ -37,11 +37,13 @@ public class MessageContentInfo {
     private String JoinType = "joinType";
     private String ChatRoom = "chatRoom";
     private String giftType = "giftType";
+    private Gson gson;
     public void setOnReceiveAndSendListener(BarrageLayout barrageLayout, String roomID, Context context, SendAndRecevieSucessCall sendAndRecevieSucessCall) {
         this.roomId = roomID;
         this.mContext = context;
+        gson = new Gson();
         this.mSendAndRecevieSucessCall = sendAndRecevieSucessCall;
         mHandler = new Handler();
         messageContentArrayList = new ArrayList<>();
@@ -63,7 +65,7 @@ public class MessageContentInfo {
                     public void run() {
                         try {
-                            Gson gson = new Gson();
+
                             CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
                             String messagecontent = cnMessageModle.getMessage().getContent();
                             String messageType = cnMessageModle.getType();
@@ -115,7 +117,6 @@ public class MessageContentInfo {
                 try {
-                    Gson gson = new Gson();
                     CNMessageModle cnMessageModle = gson.fromJson(message.getContent(), CNMessageModle.class);
                     String messagecontent = cnMessageModle.getMessage().getContent();
                     String messageType = cnMessageModle.getType();
@@ -169,8 +170,7 @@ public class MessageContentInfo {
             @Override
             public void onSuccess(int what, String extra) {
                 CNMessageModle cnMessageModle = new CNMessageModle(JoinType, new MessageInfo("", "", "", "", ""));
-                Gson gson2 = new Gson();
-                String obj2 = gson2.toJson(cnMessageModle);
+                String obj2 = gson.toJson(cnMessageModle);
                 ChatUtil.sendMessage(IChat.CHATROOM, roomId, obj2, onSendMessageListener);
             }
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-   >
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
     <RelativeLayout
         android:id="@+id/toobar"
         android:layout_width="match_parent"
-        android:layout_height="50dp">
+        android:layout_height="60dp"
+        >
-    <TextView
-        android:id="@+id/toobar_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:singleLine="true"
-        android:text="我的"
-        android:textColor="@color/config_black_color"
-        android:textSize="22sp" />
+        <TextView
+            android:id="@+id/toobar_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:singleLine="true"
+            android:text=""
+            android:textColor="@color/config_black_color"
+            android:textSize="22sp" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:paddingTop="@dimen/_20px"
-        android:background="@color/gray_line_color" />
-  </RelativeLayout>
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/_10px"
+            android:layout_alignParentBottom="true"
+            android:background="@color/gray_bg" />
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_above="@id/view"
+            android:background="@color/gray_line_color" />
+
+
+    </RelativeLayout>
 </layout>
 \ No newline at end of file