处理评论页面刷新问题以及聊天页面的 bug处理

吴奎庆
1 parent 747e6591
Showing 19 changed files with 217 additions and 19 deletions
app/build.gradle
app/src/main/java/com/cnlive/gundam/main/presenter/VodDetailPresenter.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/GlideCircleTransform.java
app/src/main/java/com/cnlive/gundam/video/activity/PlayerActivity.java
app/src/main/java/com/cnlive/gundam/video/adpter/CommonAdapter.java
app/src/main/java/com/cnlive/gundam/video/fragment/CommentDetailsFragment.java
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
app/src/main/res/color/chat_send_text.xml
app/src/main/res/drawable-xhdpi/btn_expression_nor.png
app/src/main/res/drawable-xhdpi/btn_expression_sel.png
app/src/main/res/drawable/btn_chat_send_nor.xml
app/src/main/res/drawable/btn_chat_send_sel.xml
app/src/main/res/drawable/btn_input.png
app/src/main/res/drawable/btn_send_chat_selector.xml
app/src/main/res/drawable/edit_text.xml
app/src/main/res/drawable/expression_face_selector.xml
app/src/main/res/layout/item_list_right.xml
app/src/main/res/layout/layout_input.xml
app/src/main/res/values/colors.xml
@@ -86,4 +86,5 @@ dependencies {
     compile 'com.squareup.okhttp3:okhttp-ws:3.2.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
+
 }
@@ -30,7 +30,7 @@ public class VodDetailPresenter {
     private CommentUtil commentUtil = new CommentUtil();
-    private int pageCount = 2;
+    private int pageCount = 10;
     CommentDetailsFragment commentFragment;
     public VodDetailPresenter(CommentDetailsFragment commentFragment) {
+package com.cnlive.gundam.main.ui.widget;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/7/13
+ * <p>
+ * 描述：
+ */
+
+//圆形图片
+public class GlideCircleTransform extends BitmapTransformation {
+    public GlideCircleTransform(Context context) {
+        super(context);
+    }
+
+    @Override protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+        return circleCrop(pool, toTransform);
+    }
+
+    private static Bitmap circleCrop(BitmapPool pool, Bitmap source) {
+        if (source == null) return null;
+
+        int size = Math.min(source.getWidth(), source.getHeight());
+        int x = (source.getWidth() - size) / 2;
+        int y = (source.getHeight() - size) / 2;
+
+
+        Bitmap squared = Bitmap.createBitmap(source, x, y, size, size);
+
+        Bitmap result = pool.get(size, size, Bitmap.Config.ARGB_8888);
+        if (result == null) {
+            result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        }
+
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        paint.setShader(new BitmapShader(squared, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+        paint.setAntiAlias(true);
+        float r = size / 2f;
+        canvas.drawCircle(r, r, r, paint);
+        return result;
+    }
+
+    @Override public String getId() {
+        return getClass().getName();
+    }
+}
+
@@ -104,6 +104,6 @@ public class PlayerActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        EventBus.getDefault().unregister(this);
+
     }
 }
@@ -63,6 +63,7 @@ public class CommonAdapter&lt;T&gt; extends BaseAdapter {
             binding = DataBindingUtil.getBinding(convertView);
         }
         binding.setVariable(variableId, mDataList.get(position));
+
         MessageContent user = (MessageContent) mDataList.get(position);
         if(((MessageContent) mDataList.get(position)).isSendInfo()){
@@ -238,9 +238,10 @@ public class CommentDetailsFragment extends Fragment implements VodDetialView {
         if (isLoad) {
             binding.srvVodDetail.stopLoadingMore();
             isLoad = false;
-        } else {
-            binding.srvVodDetail.complete();
+        }
+        if (binding.srvVodDetail.isRefreshing()) {
+            binding.srvVodDetail.complete();
         }
         if (mDatas == null) {
             binding.srvVodDetail.onNoMore("快来抢沙发喽~");
@@ -8,10 +8,10 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.SwitchCompat;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,12 +23,14 @@ import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentChatBinding;
 import com.cnlive.gundam.main.model.MsgEvent;
+import com.cnlive.gundam.main.ui.widget.GlideCircleTransform;
 import com.cnlive.gundam.main.ui.widget.RecyclerSpace;
 import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
 import com.cnlive.gundam.user.util.InputUtil;
 import com.cnlive.gundam.user.util.ToastUtil;
+import com.cnlive.gundam.video.activity.PlayerActivity;
 import com.cnlive.gundam.video.adpter.CommonAdapter;
 import com.cnlive.gundam.video.adpter.GiftAdapter;
 import com.cnlive.gundam.video.barrage.BarrageBaseMessage;
@@ -38,7 +40,6 @@ import com.cnlive.gundam.video.model.MessageContent;
 import com.cnlive.libs.util.chat.ChatUtil;
 import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNUserInfo;
-import com.cnlive.libs.util.data.okhttpUtil.utils.L;
 import com.cnlive.libs.video.barrage.BarrageLayout;
 import org.greenrobot.eventbus.EventBus;
@@ -86,11 +87,14 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+    String faceurl;
+
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         initListener();
         EventBus.getDefault().register(this);
+        faceurl = UserService.getInstance(getActivity()).getActiveAccountInfo().getFaceurl();
         initDate();
         initGift();
         int checkCallPhonePermission = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_PHONE_STATE);
@@ -142,12 +146,12 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @BindingAdapter({"imageUrl"})
     public static void loadImage(ImageView imageView, String url) {
-        if (url == null) {
+        if (url == null || url.equals("")) {
 //            imageView.setImageResource(R.mipmap.ic_launcher);
-            Glide.with(imageView.getContext()).load("https://yweb0.cnliveimg.com/main/cnlive/150819151803915_969.jpg").error(R.mipmap.ic_launcher).into(imageView);
+            Glide.with(imageView.getContext()).load(R.mipmap.ic_launcher).bitmapTransform(new GlideCircleTransform(imageView.getContext())).error(R.mipmap.ic_launcher).into(imageView);
         } else {
-            Glide.with(imageView.getContext()).load(url).error(R.mipmap.ic_launcher).into(imageView);
+            Glide.with(imageView.getContext()).load(url).bitmapTransform(new GlideCircleTransform(imageView.getContext())).error(R.mipmap.ic_launcher).into(imageView);
         }
     }
@@ -192,7 +196,7 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
             @Override
             public void onClick(View view) {
                 int i = View.INVISIBLE == fragmentChatBinding.rlGift.getVisibility() ? View.VISIBLE : View.INVISIBLE;
-                SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow",i);
+                SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", i);
                 fragmentChatBinding.rlGift.setVisibility(i);
             }
         });
@@ -219,6 +223,9 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         }
     }
+    /**
+     * 设置礼物
+     */
     private void initGift() {
         fragmentChatBinding.sendMessage.setOnClickListener(new View.OnClickListener() {
@@ -235,6 +242,9 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+    /**
+     * 初始化监听事件
+     */
     private void initListener() {
         barrageBottom();
         initMessageAdapter();
@@ -246,12 +256,17 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     public void giftItem(int postion) {
         fragmentChatBinding.rlGift.setVisibility(View.INVISIBLE);
-        messageContents.add(new MessageContent(messageContents.get(0).getName(), "送了" + gitName[postion] + ":", messageContents.get(0).getIcon(), false));
+        messageContents.add(new MessageContent(messageContents.get(0).getName(), "送了" + gitName[postion] + ":", faceurl, false));
         messageContentCommonAdapter.addItems((messageContents));
     }
     ArrayList<MessageContent> messageContents;
+    /**
+     * 聊天的回调接口
+     *
+     * @param messageContents
+     */
     @Override
     public void onchat(ArrayList<MessageContent> messageContents) {
         this.messageContents = messageContents;
@@ -259,17 +274,29 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+    /**
+     * 弹幕
+     *
+     * @param barrageBaseMessage
+     */
     @Override
     public void onbarrage(BarrageBaseMessage barrageBaseMessage) {
         barrageLayout.addMessage(barrageBaseMessage);
     }
-    //在注册了的Activity中,声明处理事件的方法
+    //在处理礼物返回问题
+
+
+    /**
+     * 接收页面   {@link PlayerActivity}
+     *
+     * @param event 处理 礼物出现后activity 和fragment的返回问题.
+     */
     @Subscribe(threadMode = ThreadMode.MAIN) //第2步:注册一个在后台线程执行的方法,用于接收事件
     public void onUserEvent(MsgEvent event) {
         fragmentChatBinding.rlGift.setVisibility(View.INVISIBLE);
-        SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow",4);
+        SharedPreferencesHelper.getInstance(getActivity()).setValue("ishow", 4);
     }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#515151" android:state_selected="true" />
+    <item android:color="#515151" android:state_pressed="true" />
+    <item android:color="#515151" android:state_focused="true" />
+    <item android:color="#656565" />
+</selector>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#e6e6e6" />
+    <corners android:radius="2dp" />
+    <stroke android:width="1px" android:color="#bfbfbf" android:dashWidth="1px"
+        android:dashGap="0dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#d2d2d2" />
+    <corners android:radius="2dp" />
+    <stroke android:width="1px" android:color="#ababab" android:dashWidth="1px"
+        android:dashGap="0dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_chat_send_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_chat_send_nor" android:state_pressed="false" />
+    <item android:drawable="@drawable/btn_chat_send_nor" />
+</selector>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#e6e6e6" />
+    <corners android:radius="2dp" />
+    <stroke android:width="1dp" android:color="#bfbfbf" android:dashWidth="1dp"
+        android:dashGap="0dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/btn_expression_sel" />
+    <item android:state_pressed="false" android:drawable="@drawable/btn_expression_nor" />
+</selector>
@@ -29,9 +29,10 @@
             android:paddingTop="5dp">
             <ImageView
+
                 android:id="@+id/iv_left_user_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
                 android:layout_centerVertical="true"
                 app:imageUrl="@{user.icon}" />
@@ -46,7 +47,7 @@
                     android:id="@+id/tv_left_user_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{user.name}"
+                    android:text='@{user.name}'
                     android:textColor="@android:color/white" />
                 <TextView
@@ -54,7 +55,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:text="@{user.messaage}"
+                    android:text='@{user.messaage}'
                     android:textColor="@android:color/white" />
             </LinearLayout>
@@ -93,8 +94,8 @@
             <ImageView
                 android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
                 app:imageUrl="@{user.icon}"
                 />
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:background="@android:color/white">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/main_tab_spinner_line_color" />
+
+    <ImageView
+        android:id="@+id/emoticons_button"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:src="@drawable/expression_face_selector" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_toLeftOf="@+id/post_button"
+        android:layout_toRightOf="@+id/emoticons_button"
+        android:background="@drawable/edit_text"
+        android:orientation="horizontal">
+
+
+        <EditText
+            android:id="@+id/chat_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="@string/input_button_text"
+            android:imeOptions="actionSend"
+            android:inputType="textLongMessage"
+            android:maxLength="120"
+            android:paddingLeft="8dp"
+            android:textColor="@color/text_input_color"
+            android:textColorHint="@color/text_hint_color"
+            android:textSize="16sp"
+          />
+    </LinearLayout>
+
+
+    <TextView
+        android:id="@+id/post_button"
+        android:layout_width="50dp"
+        android:layout_height="30dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:background="@drawable/btn_send_chat_selector"
+        android:gravity="center"
+        android:text="发送"
+        android:textColor="@color/chat_send_text"
+        android:textSize="16sp" />
+
+</RelativeLayout>
 \ No newline at end of file
@@ -28,4 +28,6 @@
     <color name="color_text_normal_999">#999</color>
     <color name="color_cutline_ececec">#ececec</color>
     <color name="color_9d9d9d">#9d9d9d</color>
+
+    <color name="main_tab_spinner_line_color">#D5D5D5</color>
 </resources>