解决冲突

王琳
2 parents 8fdbf84b 204c4c04
Showing 64 changed files with 3670 additions and 80 deletions
app/build.gradle
app/src/main/java/com/cnlive/gundam/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/main/model/CommentBean.java
app/src/main/java/com/cnlive/gundam/main/model/CommentTitleViewModel.java
app/src/main/java/com/cnlive/gundam/main/model/CommentViewModel.java
app/src/main/java/com/cnlive/gundam/main/model/MsgEvent.java
app/src/main/java/com/cnlive/gundam/main/model/ReplyBean.java
app/src/main/java/com/cnlive/gundam/main/model/Series.java
app/src/main/java/com/cnlive/gundam/main/model/VodDetailModel.java
app/src/main/java/com/cnlive/gundam/main/presenter/VodDetailPresenter.java
app/src/main/java/com/cnlive/gundam/main/presenter/view/VodDetialView.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/LoadImgAdapter.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/mul/BaseBindingAdapter.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/mul/BaseBindingVH.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/mul/BaseMulTypeBindingAdapter.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/mul/IBaseMulInterface.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/BaseFooterView.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/BottomTabView.java
app/src/main/java/com/cnlive/gundam/main/ui/widget/FooterViewListener.java
@@ -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'
+
 }
 package com.cnlive.gundam.application;
 import android.app.Application;
+import android.content.Context;
 import com.cnlive.libs.util.Config;
@@ -11,10 +12,15 @@ import com.cnlive.libs.util.Config;
 public class CNLiveApplication extends Application {
     public static final String secret = "c2faeb120f0ea2e2d47020d4b03cb8a93bed2585897a94";
+    private static Context mContxt;
     @Override
     public void onCreate() {
         super.onCreate();
+        mContxt=getApplicationContext();
         Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9", true);//测试信息
     }
+    public static Context getContext(){
+        return mContxt;
+    }
 }
+package com.cnlive.gundam.main.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Description：
+ * Created on 2017/3/5
+ * Author : 萧
+ */
+public class CommentBean implements Serializable, Parcelable {
+
+    private String userHead;
+
+    private String userName;
+
+    private String time;
+
+    private String commentContent;
+
+    private String praise;
+
+    private int replyNum;
+
+    private String id;
+
+    private int isPraised=2;
+
+    private List<ReplyBean> replyList;
+
+    public CommentBean() {
+    }
+
+    public CommentBean(String userHead, String userName, String time, String commentContent, String praise, String id) {
+        this.userHead = userHead;
+        this.userName = userName;
+        this.time = time;
+        this.commentContent = commentContent;
+        this.praise = praise;
+        this.id = id;
+    }
+
+    public String getUserHead() {
+        return userHead;
+    }
+
+    public void setUserHead(String userHead) {
+        this.userHead = userHead;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getCommentContent() {
+        return commentContent;
+    }
+
+    public void setCommentContent(String commentContent) {
+        this.commentContent = commentContent;
+    }
+
+    public String getPraise() {
+        return praise;
+    }
+
+    public void setPraise(String praise) {
+        this.praise = praise;
+    }
+
+    public int isPraised() {
+        return isPraised;
+    }
+
+    public void setPraised(int praised) {
+        isPraised = praised;
+    }
+
+    public int getReplyNum() {
+        return replyNum;
+    }
+
+    public void setReplyNum(int replyNum) {
+        this.replyNum = replyNum;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<ReplyBean> getReplyList() {
+        return replyList;
+    }
+
+    public void setReplyList(List<ReplyBean> replyList) {
+        this.replyList = replyList;
+    }
+
+    @Override
+    public String toString() {
+        return "CommentBean{" +
+                "userHead='" + userHead + '\'' +
+                ", userName='" + userName + '\'' +
+                ", time='" + time + '\'' +
+                ", commentContent='" + commentContent + '\'' +
+                ", praise=" + praise +
+                ", replyNum=" + replyNum +
+                ", id=" + id +
+                ", replyList=" + replyList +
+                '}';
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.userHead);
+        dest.writeString(this.userName);
+        dest.writeString(this.time);
+        dest.writeString(this.commentContent);
+        dest.writeString(this.praise);
+        dest.writeInt(this.replyNum);
+        dest.writeString(this.id);
+        dest.writeTypedList(this.replyList);
+        dest.writeInt(this.isPraised);
+    }
+
+    protected CommentBean(Parcel in) {
+        this.userHead = in.readString();
+        this.userName = in.readString();
+        this.time = in.readString();
+        this.commentContent = in.readString();
+        this.praise = in.readString();
+        this.replyNum = in.readInt();
+        this.id = in.readString();
+        this.replyList = in.createTypedArrayList(ReplyBean.CREATOR);
+        this.isPraised = in.readInt();
+    }
+
+    public static final Creator<CommentBean> CREATOR = new Creator<CommentBean>() {
+        @Override
+        public CommentBean createFromParcel(Parcel source) {
+            return new CommentBean(source);
+        }
+
+        @Override
+        public CommentBean[] newArray(int size) {
+            return new CommentBean[size];
+        }
+    };
+}
+package com.cnlive.gundam.main.model;
+
+import android.databinding.BaseObservable;
+import android.databinding.Bindable;
+
+import com.cnlive.gundam.BR;
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.ui.adapter.mul.IBaseMulInterface;
+
+
+/**
+ * Created by ZJL on 2017/5/24.
+ */
+
+public class CommentTitleViewModel extends BaseObservable implements IBaseMulInterface {
+    private String count;
+    public CommentTitleViewModel(String count){
+        this.count =count;
+
+
+    }
+
+    @Bindable
+    public String getCount(){
+        return count;
+    }
+    public void setCount(String count){
+        this.count=count;
+        notifyPropertyChanged(BR.count);
+    }
+    @Override
+    public int getItemLayoutId() {
+        return R.layout.item_comment_title;
+    }
+}
+package com.cnlive.gundam.main.model;
+
+import android.databinding.BaseObservable;
+import android.databinding.Bindable;
+import android.databinding.ObservableBoolean;
+
+import com.cnlive.gundam.BR;
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.ui.adapter.mul.IBaseMulInterface;
+
+
+/**
+ * Created by ZJL on 2017/5/24.
+ */
+
+public class CommentViewModel extends BaseObservable implements IBaseMulInterface {
+    private CommentBean commentBean;
+    private String praise;
+    private int praiseImage = R.drawable.vod_detail_good;
+    public final ObservableBoolean isClickAble = new ObservableBoolean(true);
+
+    @Bindable
+    public int getPraiseImage() {
+        return praiseImage;
+    }
+
+    public void setPraiseImage(int praiseImage) {
+        this.praiseImage = praiseImage;
+        notifyPropertyChanged(BR.praiseImage);
+    }
+
+    public CommentViewModel(CommentBean commentBean) {
+        this.commentBean = commentBean;
+    }
+
+    public CommentBean getCommentBean() {
+        return commentBean;
+    }
+
+    public String getUserHead() {
+        return commentBean.getUserHead();
+    }
+
+    public String getUserName() {
+        return commentBean.getUserName();
+    }
+
+    public String getId() {
+        return commentBean.getId();
+    }
+    public String getTime() {
+        return commentBean.getTime();
+    }
+
+    public String getCommentContent() {
+        return commentBean.getCommentContent();
+    }
+
+    @Bindable
+    public String getPraise() {
+        return commentBean.getPraise();
+    }
+
+    public void setPraise(String praiseCount) {
+        commentBean.setPraise(praiseCount);
+        notifyPropertyChanged(BR.praise);
+    }
+
+    @Override
+    public int getItemLayoutId() {
+        return R.layout.item_comment;
+    }
+}
+package com.cnlive.gundam.main.model;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/7/12
+ * <p>
+ * 描述：
+ */
+
+public class MsgEvent {
+}
+package com.cnlive.gundam.main.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.Serializable;
+
+/**
+ * Description：
+ * Created on 2017/3/5
+ * Author : 萧
+ */
+public class ReplyBean implements Serializable, Parcelable {
+
+    private Integer recordId;
+
+    private String userName;
+
+    private String userHead;
+
+    private String replyContent;
+
+    private String replyTime;
+
+    private Integer commentId;
+
+    public ReplyBean() {
+    }
+
+    public ReplyBean(Integer recordId, String userName, String userHead, String replyContent, String replyTime, Integer commentId) {
+        this.recordId = recordId;
+        this.userName = userName;
+        this.userHead = userHead;
+        this.replyContent = replyContent;
+        this.replyTime = replyTime;
+        this.commentId = commentId;
+    }
+
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserHead() {
+        return userHead;
+    }
+
+    public void setUserHead(String userHead) {
+        this.userHead = userHead;
+    }
+
+    public String getReplyContent() {
+        return replyContent;
+    }
+
+    public void setReplyContent(String replyContent) {
+        this.replyContent = replyContent;
+    }
+
+    public String getReplyTime() {
+        return replyTime;
+    }
+
+    public void setReplyTime(String replyTime) {
+        this.replyTime = replyTime;
+    }
+
+    public Integer getCommentId() {
+        return commentId;
+    }
+
+    public void setCommentId(Integer commentId) {
+        this.commentId = commentId;
+    }
+
+    @Override
+    public String toString() {
+        return "ReplyBean{" +
+                "recordId=" + recordId +
+                ", userName='" + userName + '\'' +
+                ", userHead='" + userHead + '\'' +
+                ", replyContent='" + replyContent + '\'' +
+                ", replyTime='" + replyTime + '\'' +
+                ", commentId=" + commentId +
+                '}';
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeValue(this.recordId);
+        dest.writeString(this.userName);
+        dest.writeString(this.userHead);
+        dest.writeString(this.replyContent);
+        dest.writeString(this.replyTime);
+        dest.writeValue(this.commentId);
+    }
+
+    protected ReplyBean(Parcel in) {
+        this.recordId = (Integer) in.readValue(Integer.class.getClassLoader());
+        this.userName = in.readString();
+        this.userHead = in.readString();
+        this.replyContent = in.readString();
+        this.replyTime = in.readString();
+        this.commentId = (Integer) in.readValue(Integer.class.getClassLoader());
+    }
+
+    public static final Creator<ReplyBean> CREATOR = new Creator<ReplyBean>() {
+        @Override
+        public ReplyBean createFromParcel(Parcel source) {
+            return new ReplyBean(source);
+        }
+
+        @Override
+        public ReplyBean[] newArray(int size) {
+            return new ReplyBean[size];
+        }
+    };
+}
+package com.cnlive.gundam.main.model;
+
+/**
+ * Created by ZJL on 2017/6/14.
+ */
+
+public class Series {
+    private int number;
+
+    private String title;
+
+    private String description;
+
+    private String flashUrl;
+
+    private String rates;
+
+    public void setNumber(int number){
+        this.number = number;
+    }
+    public int getNumber(){
+        return this.number;
+    }
+    public void setTitle(String title){
+        this.title = title;
+    }
+    public String getTitle(){
+        return this.title;
+    }
+    public void setDescription(String description){
+        this.description = description;
+    }
+    public String getDescription(){
+        return this.description;
+    }
+    public void setFlashUrl(String flashUrl){
+        this.flashUrl = flashUrl;
+    }
+    public String getFlashUrl(){
+        return this.flashUrl;
+    }
+    public void setRates(String rates){
+        this.rates = rates;
+    }
+    public String getRates(){
+        return this.rates;
+    }
+}
+package com.cnlive.gundam.main.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by ZJL on 2017/6/13.
+ */
+
+public class VodDetailModel extends ErrorMessage implements Parcelable,Serializable {
+    /**
+     * errorMessage : 数据加载成功
+     * pageUrl : http://v.cnlive.com/ffyl/v_g4zd1nzqgu.html
+     * CMSChannelName :
+     * vipFlag : 0
+     * type : program
+     * packagePomID : 3_ent/mxfb/
+     * cmsChannelID : ent/
+     * MAM_ProducerID : 先锋派
+     * activityId :
+     * title : 贝思客2017品牌发布会
+     * MAM_NodeID : 014-018-001
+     * docSubTitle : 贝思客2017品牌发布会
+     * playAuto : xiangguanshipin
+     * docID : 807125
+     * MAM_SmallPosterUrl : http://y1.cnliveimg.com:8080/image/itv/2017/0328/d98b809afa2d4234b3c15b2168be8061_100.jpg
+     * onePomID : 3_82_88d98b809afa2d4234b3c15b2168be8061
+     * flashUrl : http://wideo00.cnlive.com/video/data3/2017/0328/feifan4_20170328134656.mp4
+     * mediaId : 82_88d98b809afa2d4234b3c15b2168be8061
+     * MAM_NodeName : 综合/非凡娱乐/星光回放
+     * MAM_PosterUrl : http://y1.cnliveimg.com:8080/image/itv/2017/0328/d98b809afa2d4234b3c15b2168be8061_100.jpg
+     * status : 1
+     * cmsColumnID : ent/mxfb/
+     * rates : 1,2,3
+     * freePlayLength : 60
+     * errorCode : 0
+     * docDescription : 贝思客2017品牌发布会，此次出席嘉宾是唐嫣，该品牌利用O2O线上线下交互销售。在贝思客PC官网、移动端微网站、手机APP、客服热线等各种方式均可订购蛋糕。
+     * modules : [{"id":"xiangguanshipin","title":"相关推荐"}]
+     * colName :
+     */
+
+    private String pageUrl;
+    private String CMSChannelName;
+    private String vipFlag;
+    private String type;
+    private String packagePomID;
+    private String cmsChannelID;
+    private String MAM_ProducerID;
+    private String activityId;
+    private String title;
+    private String MAM_NodeID;
+    private String docSubTitle;
+    private String playAuto;
+    private String docID;
+    private String MAM_SmallPosterUrl;
+    private String onePomID;
+    private String flashUrl;
+    private String mediaId;
+    private String MAM_NodeName;
+    private String MAM_PosterUrl;
+    private String status;
+    private String cmsColumnID;
+    private String rates;
+    private String freePlayLength;
+    private String docDescription;
+    private String colName;
+    private List<ModulesBean> modules;
+    private List<Series> series ;
+
+    protected VodDetailModel(Parcel in) {
+        pageUrl = in.readString();
+        CMSChannelName = in.readString();
+        vipFlag = in.readString();
+        type = in.readString();
+        packagePomID = in.readString();
+        cmsChannelID = in.readString();
+        MAM_ProducerID = in.readString();
+        activityId = in.readString();
+        title = in.readString();
+        MAM_NodeID = in.readString();
+        docSubTitle = in.readString();
+        playAuto = in.readString();
+        docID = in.readString();
+        MAM_SmallPosterUrl = in.readString();
+        onePomID = in.readString();
+        flashUrl = in.readString();
+        mediaId = in.readString();
+        MAM_NodeName = in.readString();
+        MAM_PosterUrl = in.readString();
+        status = in.readString();
+        cmsColumnID = in.readString();
+        rates = in.readString();
+        freePlayLength = in.readString();
+        docDescription = in.readString();
+        colName = in.readString();
+    }
+
+    public static final Creator<VodDetailModel> CREATOR = new Creator<VodDetailModel>() {
+        @Override
+        public VodDetailModel createFromParcel(Parcel in) {
+            return new VodDetailModel(in);
+        }
+
+        @Override
+        public VodDetailModel[] newArray(int size) {
+            return new VodDetailModel[size];
+        }
+    };
+
+    public void setSeries(List<Series> series){
+        this.series = series;
+    }
+    public List<Series> getSeries(){
+        return this.series;
+    }
+    public String getPageUrl() {
+        return pageUrl;
+    }
+
+    public void setPageUrl(String pageUrl) {
+        this.pageUrl = pageUrl;
+    }
+
+    public String getCMSChannelName() {
+        return CMSChannelName;
+    }
+
+    public void setCMSChannelName(String CMSChannelName) {
+        this.CMSChannelName = CMSChannelName;
+    }
+
+    public String getVipFlag() {
+        return vipFlag;
+    }
+
+    public void setVipFlag(String vipFlag) {
+        this.vipFlag = vipFlag;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getPackagePomID() {
+        return packagePomID;
+    }
+
+    public void setPackagePomID(String packagePomID) {
+        this.packagePomID = packagePomID;
+    }
+
+    public String getCmsChannelID() {
+        return cmsChannelID;
+    }
+
+    public void setCmsChannelID(String cmsChannelID) {
+        this.cmsChannelID = cmsChannelID;
+    }
+
+    public String getMAM_ProducerID() {
+        return MAM_ProducerID;
+    }
+
+    public void setMAM_ProducerID(String MAM_ProducerID) {
+        this.MAM_ProducerID = MAM_ProducerID;
+    }
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMAM_NodeID() {
+        return MAM_NodeID;
+    }
+
+    public void setMAM_NodeID(String MAM_NodeID) {
+        this.MAM_NodeID = MAM_NodeID;
+    }
+
+    public String getDocSubTitle() {
+        return docSubTitle;
+    }
+
+    public void setDocSubTitle(String docSubTitle) {
+        this.docSubTitle = docSubTitle;
+    }
+
+    public String getPlayAuto() {
+        return playAuto;
+    }
+
+    public void setPlayAuto(String playAuto) {
+        this.playAuto = playAuto;
+    }
+
+    public String getDocID() {
+        return docID;
+    }
+
+    public void setDocID(String docID) {
+        this.docID = docID;
+    }
+
+    public String getMAM_SmallPosterUrl() {
+        return MAM_SmallPosterUrl;
+    }
+
+    public void setMAM_SmallPosterUrl(String MAM_SmallPosterUrl) {
+        this.MAM_SmallPosterUrl = MAM_SmallPosterUrl;
+    }
+
+    public String getOnePomID() {
+        return onePomID;
+    }
+
+    public void setOnePomID(String onePomID) {
+        this.onePomID = onePomID;
+    }
+
+    public String getFlashUrl() {
+        return flashUrl;
+    }
+
+    public void setFlashUrl(String flashUrl) {
+        this.flashUrl = flashUrl;
+    }
+
+    public String getMediaId() {
+        return mediaId;
+    }
+
+    public void setMediaId(String mediaId) {
+        this.mediaId = mediaId;
+    }
+
+    public String getMAM_NodeName() {
+        return MAM_NodeName;
+    }
+
+    public void setMAM_NodeName(String MAM_NodeName) {
+        this.MAM_NodeName = MAM_NodeName;
+    }
+
+    public String getMAM_PosterUrl() {
+        return MAM_PosterUrl;
+    }
+
+    public void setMAM_PosterUrl(String MAM_PosterUrl) {
+        this.MAM_PosterUrl = MAM_PosterUrl;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getCmsColumnID() {
+        return cmsColumnID;
+    }
+
+    public void setCmsColumnID(String cmsColumnID) {
+        this.cmsColumnID = cmsColumnID;
+    }
+
+    public String getRates() {
+        return rates;
+    }
+
+    public void setRates(String rates) {
+        this.rates = rates;
+    }
+
+    public String getFreePlayLength() {
+        return freePlayLength;
+    }
+
+    public void setFreePlayLength(String freePlayLength) {
+        this.freePlayLength = freePlayLength;
+    }
+
+
+    public String getDocDescription() {
+        return docDescription;
+    }
+
+    public void setDocDescription(String docDescription) {
+        this.docDescription = docDescription;
+    }
+
+    public String getColName() {
+        return colName;
+    }
+
+    public void setColName(String colName) {
+        this.colName = colName;
+    }
+
+    public List<ModulesBean> getModules() {
+        return modules;
+    }
+
+    public void setModules(List<ModulesBean> modules) {
+        this.modules = modules;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(pageUrl);
+        dest.writeString(CMSChannelName);
+        dest.writeString(vipFlag);
+        dest.writeString(type);
+        dest.writeString(packagePomID);
+        dest.writeString(cmsChannelID);
+        dest.writeString(MAM_ProducerID);
+        dest.writeString(activityId);
+        dest.writeString(title);
+        dest.writeString(MAM_NodeID);
+        dest.writeString(docSubTitle);
+        dest.writeString(playAuto);
+        dest.writeString(docID);
+        dest.writeString(MAM_SmallPosterUrl);
+        dest.writeString(onePomID);
+        dest.writeString(flashUrl);
+        dest.writeString(mediaId);
+        dest.writeString(MAM_NodeName);
+        dest.writeString(MAM_PosterUrl);
+        dest.writeString(status);
+        dest.writeString(cmsColumnID);
+        dest.writeString(rates);
+        dest.writeString(freePlayLength);
+        dest.writeString(docDescription);
+        dest.writeString(colName);
+    }
+
+    public static class ModulesBean {
+        /**
+         * id : xiangguanshipin
+         * title : 相关推荐
+         */
+
+        private String id;
+        private String title;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+    }
+}
+package com.cnlive.gundam.main.presenter;
+
+import android.text.TextUtils;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.model.CommentBean;
+import com.cnlive.gundam.main.model.CommentTitleViewModel;
+import com.cnlive.gundam.main.model.CommentViewModel;
+import com.cnlive.gundam.video.fragment.CommentDetailsFragment;
+import com.cnlive.gundam.video.utils.ToastUtil;
+import com.cnlive.libs.util.chat.model.ErrorMessage;
+import com.cnlive.libs.util.comment.CommentUtil;
+import com.cnlive.libs.util.comment.base.CommentCallback;
+import com.cnlive.libs.util.comment.base.CommentListCallback;
+import com.cnlive.libs.util.model.CommentItem;
+import com.cnlive.libs.util.model.CommentPage;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/7/12
+ * <p>
+ * 描述：  评论界面的 presenter
+ */
+
+public class VodDetailPresenter {
+    List mDatas = new ArrayList();
+
+    private CommentUtil commentUtil = new CommentUtil();
+
+    private int pageCount = 10;
+    CommentDetailsFragment commentFragment;
+
+    public VodDetailPresenter(CommentDetailsFragment commentFragment) {
+        this.commentFragment = commentFragment;
+    }
+
+
+    public void getData()
+    {
+        mDatas.add(new CommentTitleViewModel("0"));
+        commentFragment.onLoadDataComplete(null,mDatas);
+    }
+    public void getComment(final boolean scrollState, String mContentId, int page) {
+
+
+
+        commentUtil.readAllComment(mContentId, page, pageCount, new CommentListCallback() {
+            @Override
+            public void onResponse(CommentPage commentPage) {
+                List mDatas = new ArrayList();
+                mDatas.clear();
+
+                if ("0".equals(commentPage.getErrorCode())) {
+                    if (commentPage.getData() == null || commentPage.getData().getComments() == null) {
+                        if (commentFragment != null)
+                            commentFragment.onLoadCommentComplete(null, false);
+                        return;
+                    }
+
+                    CommentTitleViewModel commentTitleViewModel = (CommentTitleViewModel) VodDetailPresenter.this.mDatas.get(0);
+
+                    commentTitleViewModel.setCount(commentPage.getData().getTotal_columns() + "");
+                    if (scrollState) {
+                        CommentItem item = commentPage.getData().getComments().get(0);
+                        CommentBean commentBean = new CommentBean(item.getFacepath(), item.getNick(), item.getCreated_at(), item.getContent(), item.getPraise(), item.getId());
+                        CommentViewModel commentViewModel = new CommentViewModel(commentBean);
+                        mDatas.add(commentViewModel);
+                        commentFragment.onLoadCommentComplete(mDatas, true);
+                        return;
+
+                    }
+                    for (CommentItem item : commentPage.getData().getComments()) {
+                        CommentBean commentBean = new CommentBean();
+                        commentBean.setCommentContent(item.getContent());
+                        commentBean.setPraise(item.getPraise());
+                        commentBean.setTime(item.getCreated_at());
+                        commentBean.setUserHead(item.getFacepath());
+                        commentBean.setUserName(item.getNick());
+                        commentBean.setId(item.getId());
+                        CommentViewModel commentViewModel = new CommentViewModel(commentBean);
+                        mDatas.add(commentViewModel);
+
+                    }
+                    commentFragment.onLoadCommentComplete(mDatas, false);
+                } else {
+                    ToastUtil.showToast("评论信息加载失败");
+                }
+            }
+        });
+    }
+
+    public void toPraise(final CommentViewModel commentViewModel, String mContentId, String uid) {
+        commentViewModel.isClickAble.set(false);
+        if (commentViewModel.getCommentBean() != null && commentViewModel.getCommentBean().isPraised() == 2) {
+            commentUtil.praiseComment(mContentId, uid, commentViewModel.getCommentBean().getId(), new CommentCallback() {
+                @Override
+                public void onResponse(ErrorMessage errorMessage) {
+                    commentViewModel.isClickAble.set(true);
+                    if ("0".equals(errorMessage.getErrorCode())) {
+                        String praise = commentViewModel.getPraise();
+                        if (!TextUtils.isEmpty(praise)) {
+                            int praiseTotal = Integer.parseInt(praise);
+                            praiseTotal++;
+                            praise = praiseTotal + "";
+                        }
+                        commentViewModel.getCommentBean().setPraised(1);
+                        commentViewModel.setPraise(praise);
+                        commentViewModel.setPraiseImage(R.drawable.icon_praise_selected);
+                    } else {
+                        ToastUtil.showToast("点赞失败");
+                    }
+                }
+            });
+        } else {
+            ToastUtil.showToast("已赞");
+        }
+    }
+
+    public void addCommment(final String mContentId, String uid, String message) {
+        commentUtil.insertComment(mContentId, uid, message, new CommentCallback() {
+            @Override
+            public void onResponse(ErrorMessage commentPage) {
+                if ("0".equals(commentPage.getErrorCode())) {
+                    getComment(true, mContentId, 1);
+                    ToastUtil.showToast("评论成功");
+//                    Toast.makeText(getActivity(), "点赞失败", Toast.LENGTH_SHORT).show();
+                } else {
+                    ToastUtil.showToast("评论信息加载失败");
+                }
+            }
+        });
+    }
+}
+package com.cnlive.gundam.main.presenter.view;
+
+
+import com.cnlive.gundam.main.model.VodDetailModel;
+
+import java.util.List;
+
+/**
+ * Created by ZJL on 2017/6/16.
+ */
+
+public interface VodDetialView  {
+    void onLoadDataComplete(VodDetailModel model, List mDatas);
+    void onLoadCommentComplete(List mDatas, boolean isScroll);
+}
+package com.cnlive.gundam.main.ui.adapter;
+
+import android.databinding.BindingAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+
+
+
+/**
+ * Created by ZJL on 2017/5/15
+ */
+
+public class LoadImgAdapter {
+
+
+    @BindingAdapter({"circleUrl"})
+    public static void loadCircleImage(ImageView iv, String url) {
+        Glide.with(iv.getContext()).load(url).into(iv);
+
+
+    }
+
+
+    @BindingAdapter({"backgroundUrl"})
+    public static void loadNetImageInt(ImageView imageView, int url) {
+
+//        Glide.with(iv.getContext()).load(url).into(iv);
+//        SimpleTarget target = new SimpleTarget<Drawable>(){
+//            @Override
+//            public void onResourceReady(Drawable resource, GlideAnimation<? super Drawable> glideAnimation) {
+//                textView.setBackground(resource);
+//            }
+//        };
+//        Glide.with(textView.getContext())
+//                .load(R.drawable.search_text_red)
+//                .into(textView);
+        imageView.setImageResource(url);
+    }
+}
+package com.cnlive.gundam.main.ui.adapter.mul;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+
+import com.cnlive.gundam.BR;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by ZJL on 2017/5/14.
+ */
+
+public class BaseBindingAdapter<D, B extends ViewDataBinding> extends RecyclerView.Adapter<BaseBindingVH<B>> {
+    protected Context mContext;
+    protected int mLayoutId;
+    protected List<D> mDatas;
+    protected LayoutInflater mInfalter;
+    //用于设置Item的事件Presenter
+    protected Object ItemPresenter;
+
+    public BaseBindingAdapter(Context mContext, List mDatas, int mLayoutId) {
+        this.mContext = mContext;
+        this.mLayoutId = mLayoutId;
+        this.mDatas = mDatas;
+        this.mInfalter = LayoutInflater.from(mContext);
+    }
+
+    public BaseBindingAdapter(Context mContext, List mDatas) {
+        this.mContext = mContext;
+        this.mDatas = mDatas;
+        this.mInfalter = LayoutInflater.from(mContext);
+    }
+
+    @Override
+    public BaseBindingVH<B> onCreateViewHolder(ViewGroup parent, int viewType) {
+        BaseBindingVH<B> holder = new BaseBindingVH<B>((B) DataBindingUtil.inflate(mInfalter, mLayoutId, parent, false));
+        onCreateViewHolder(holder);
+        return holder;
+    }
+
+    /**
+     * 如果需要给Vh设置监听器啥的 可以在这里
+     *
+     * @param holder
+     */
+    public void onCreateViewHolder(BaseBindingVH<B> holder) {
+
+    }
+
+    /**
+     * 子类除了绑定数据，还要设置监听器等其他操作。
+     * 可以重写这个方法，不要删掉super.onBindViewHolder(holder, position);
+     *
+     * @param holder
+     * @param position
+     */
+    @Override
+    public void onBindViewHolder(BaseBindingVH<B> holder, int position) {
+        holder.getBinding().setVariable(BR.data, mDatas.get(position));
+        holder.getBinding().setVariable(BR.itemP, ItemPresenter);
+        holder.getBinding().executePendingBindings();
+    }
+
+    @Override
+    public int getItemCount() {
+        return null != mDatas ? mDatas.size() : 0;
+    }
+
+    public Object getItemPresenter() {
+        return ItemPresenter;
+    }
+
+    /**
+     * 用于设置Item的事件Presenter
+     *
+     * @param itemPresenter
+     * @return
+     */
+    public BaseBindingAdapter setItemPresenter(Object itemPresenter) {
+        ItemPresenter = itemPresenter;
+        return this;
+    }
+
+    /**
+     * 刷新数据，初始化数据
+     *
+     * @param list
+     */
+    public void setDatas(List<D> list) {
+        if (this.mDatas != null) {
+            if (null != list) {
+                List<D> temp = new ArrayList<D>();
+                temp.addAll(list);
+                this.mDatas.clear();
+                this.mDatas.addAll(temp);
+            } else {
+                this.mDatas.clear();
+            }
+        } else {
+            this.mDatas = list;
+        }
+        notifyDataSetChanged();
+    }
+
+    /**
+     * 删除一条数据
+     * 会自动定向刷新
+     *
+     * @param i
+     */
+    public void remove(int i) {
+        if (null != mDatas && mDatas.size() > i && i > -1) {
+            mDatas.remove(i);
+            notifyItemRemoved(i);
+        }
+    }
+
+    /**
+     * 添加一条数据 至队尾
+     * 会自动定向刷新
+     *
+     * @param data
+     */
+    public void add(D data) {
+        if (data != null && mDatas != null) {
+            mDatas.add(data);
+            notifyItemInserted(mDatas.size());
+        }
+    }
+
+    /**
+     * 在指定位置添加一条数据
+     * 会自动定向刷新
+     * <p>
+     * 如果指定位置越界，则添加在队尾
+     *
+     * @param position
+     * @param data
+     */
+    public void add(int position, D data) {
+        if (data != null && mDatas != null) {
+            if (mDatas.size() > position && position > -1) {
+                mDatas.add(position, data);
+                notifyItemInserted(position);
+                notifyItemChanged(position);
+            } else {
+                add(data);
+            }
+        }
+    }
+
+    public void notifyItem(int position) {
+        notifyItemChanged(position);
+    }
+
+
+    /**
+     * 加载更多数据
+     *
+     * @param list
+     */
+    public void addDatas(List<D> list) {
+        if (null != list) {
+            List<D> temp = new ArrayList<D>();
+            temp.addAll(list);
+            if (this.mDatas != null) {
+                this.mDatas.addAll(temp);
+            } else {
+                this.mDatas = temp;
+            }
+            notifyDataSetChanged();
+        }
+
+    }
+
+
+    public List<D> getDatas() {
+        return mDatas;
+    }
+}
+package com.cnlive.gundam.main.ui.adapter.mul;
+
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+
+/**
+ * Created by ZJL on 2017/5/14.
+ */
+
+public class BaseBindingVH<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    protected final T mBinding;
+
+    public BaseBindingVH(T t) {
+        super(t.getRoot());
+        mBinding = t;
+    }
+
+    public T getBinding() {
+        return mBinding;
+    }
+}
+package com.cnlive.gundam.main.ui.adapter.mul;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.util.Log;
+import android.view.ViewGroup;
+
+
+
+import java.util.List;
+
+/**
+ * 介绍：多种ItemType的Base类
+ * 泛型T:多Item多Bean情况可以不传。如果只有一种Bean类型，可以传入Bean，实现IBaseMulInterface接口。
+ * 或者传入IBaseMulInterface接口，可以拿到 getItemLayoutId()，
+ * 但是通过getItemViewType(int position)，一样。所以多Item多Bean建议不传。
+ * <p>
+ * 基类的泛型B：不用传，因为多种ItemType 肯定Layout长得不一样，那么Binding类也不一样，传入没有任何意义
+ * Created by ZJL on 2017/5/15
+ */
+
+public class BaseMulTypeBindingAdapter<T extends IBaseMulInterface> extends BaseBindingAdapter<T, ViewDataBinding> {
+
+    public BaseMulTypeBindingAdapter(Context mContext, List<T> mDatas) {
+        super(mContext, mDatas);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mDatas.get(position).getItemLayoutId();
+    }
+
+    @Override
+    public BaseBindingVH<ViewDataBinding> onCreateViewHolder(ViewGroup parent, int viewType) {
+        Log.i("zjl","viewType:"+viewType);
+        BaseBindingVH<ViewDataBinding> holder = new BaseBindingVH<ViewDataBinding>(DataBindingUtil.inflate(mInfalter, viewType, parent, false));
+        onCreateViewHolder(holder);
+        return holder;
+    }
+}
+package com.cnlive.gundam.main.ui.adapter.mul;
+
+/**
+ * 介绍：多种类型viewType的ViewModel需要实现的接口
+ * 根据不同的itemType返回不同的ItemLayoutId
+ * Created by ZJL on 2017/5/15
+ */
+
+public interface IBaseMulInterface {
+    public int getItemLayoutId();
+}
@@ -18,6 +18,7 @@ import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.activity.UserPersonalActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
+import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.libs.user.IUserService;
 import com.cnlive.libs.user.UserUtil;
 import com.cnlive.libs.user.model.UserData;
@@ -29,7 +30,8 @@ import com.cnlive.libs.util.data.network.Callback;
 public class ConfigFragment extends Fragment implements View.OnClickListener {
     private UserFragmentBinding binding;
-    private User activeAccountInfo;
+
+    private User user;
     @Nullable
     @Override
@@ -89,14 +91,16 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onResume() {
         super.onResume();
-        notifyUI(UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0);
+        user = UserService.getInstance(getActivity()).getActiveAccountInfo();
+        boolean isLogin = user != null && user.getUid() != 0;
+        notifyUI(isLogin);
+        if (!isLogin) return;
+        updateUserInfo();
     }
     private void notifyUI(boolean isLogin) {
         if(isLogin){
-            activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
-            updateUserInfo(activeAccountInfo);
-            activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+            User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
             Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
             binding.tvNickname.setText(activeAccountInfo.getNickname());
         }else{
@@ -105,9 +109,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
         }
     }
-
-
-    private void updateUserInfo(User user) {
+    private void updateUserInfo() {
         UserUtil.queryUserInfo(String.valueOf(user.getUid()), String.valueOf(user.getUid()), new Callback() {
             @Override
             public void onState(int i, String s, Object obj) {
@@ -115,6 +117,12 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                     UserData userData = (UserData) obj;
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setActiveAccountInfo(userData.getData());
+                    notifyUI(true);
+                } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.clearUser();
+                    notifyUI(false);
                 }
             }
         });
+package com.cnlive.gundam.main.ui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+/**
+ * Created by ZJL on 2017/6/15.
+ */
+public abstract class BaseFooterView extends FrameLayout implements FooterViewListener{
+
+    public BaseFooterView(Context context) {
+        super(context);
+    }
+
+    public BaseFooterView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BaseFooterView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+}
+package com.cnlive.gundam.main.ui.widget;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+
+import com.cnlive.gundam.R;
+
+import java.util.List;
+
+/**
+ * Created by ZJL on 2017/5/14.
+ */
+
+public class BottomTabView extends LinearLayout {
+
+    /**
+     * 记录最新的选择位置
+     */
+    private int lastPosition = -1;
+
+    /**
+     * 所有 TabItem 的集合
+     */
+    private List<TabItemView> tabItemViews;
+
+    public BottomTabView(Context context) {
+        super(context);
+    }
+
+    public BottomTabView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+
+    public BottomTabView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    /**
+     * 设置 Tab Item View
+     */
+    public void setTabItemViews(List<TabItemView> tabItemViews){
+        setTabItemViews(tabItemViews, null);
+    }
+
+    /**
+     * 设置 Tab Item View
+     */
+    public void setTabItemViews(List<TabItemView> tabItemViews, View centerView){
+
+        if (this.tabItemViews != null){
+            throw new RuntimeException("不能重复设置！");
+        }
+
+        if (tabItemViews == null || tabItemViews.size() < 2){
+            throw new RuntimeException("TabItemView 的数量必须大于2！");
+        }
+
+        this.tabItemViews = tabItemViews;
+        for (int i=0; i<tabItemViews.size(); i++) {
+
+            if (centerView != null && i == tabItemViews.size() / 2){
+                this.addView(centerView);
+            }
+
+            final TabItemView tabItemView = tabItemViews.get(i);
+
+            this.addView(tabItemView);
+
+            final int finalI = i;
+
+            tabItemView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    if (finalI == lastPosition){
+                        // 第二次点击
+                        if (onSecondSelectListener != null){
+                            onSecondSelectListener.onSecondSelect(finalI);
+                        }
+                        return ;
+                    }
+
+                    updatePosition(finalI);
+
+                    if (onTabItemSelectListener != null){
+                        onTabItemSelectListener.onTabItemSelect(finalI);
+                    }
+                }
+            });
+        }
+
+        /**
+         * 将所有的 TabItem 设置为 初始化状态
+         */
+        for (TabItemView tab : tabItemViews) {
+            tab.setStatus(TabItemView.DEFAULT);
+        }
+
+        /**
+         * 默认状态选择第一个
+         */
+        updatePosition(0);
+    }
+
+    /**
+     * 更新被选中 Tab Item 的状态
+     * 恢复上一个 Tab Item 的状态
+     */
+    public void updatePosition(int position){
+        Log.i("zjl","position:"+position);
+        if(position==-1){
+            lastPosition=-1;
+            for (int i = 0; i < tabItemViews.size(); i++) {
+                tabItemViews.get(i).setStatus(TabItemView.DEFAULT);
+            }
+        }else
+        if (lastPosition != position){
+            tabItemViews.get(position).setStatus(TabItemView.PRESS);
+            if (lastPosition != -1) {
+                tabItemViews.get(lastPosition).setStatus(TabItemView.DEFAULT);
+            }
+            lastPosition = position;
+        }
+    }
+
+    OnTabItemSelectListener onTabItemSelectListener;
+    OnSecondSelectListener onSecondSelectListener;
+
+    public void setOnTabItemSelectListener(OnTabItemSelectListener onTabItemSelectListener){
+        this.onTabItemSelectListener = onTabItemSelectListener;
+    }
+
+    public void setOnSecondSelectListener(OnSecondSelectListener onSecondSelectListener){
+        this.onSecondSelectListener = onSecondSelectListener;
+    }
+
+    /**
+     * 第二次被选择的监听器
+     */
+    public interface OnSecondSelectListener{
+        void onSecondSelect(int position);
+    }
+
+    /**
+     * 第一次被选择的监听器
+     */
+    public interface OnTabItemSelectListener{
+        void onTabItemSelect(int position);
+    }
+
+    /**
+     * Item
+     */
+    public static class TabItemView extends LinearLayout {
+
+        /**
+         * 两个状态 选中、未选中
+         */
+        public final static int PRESS = 1;
+        public final static int DEFAULT = 2;
+
+        /**
+         * Item 的标题
+         */
+        public String title;
+
+        /**
+         * 标题的两个状态的颜色 选中、未选中
+         */
+        public int colorDef;
+        public int colorPress;
+
+        /**
+         * 两个图标的 资源 id ，选中、未选中
+         */
+        public int iconResDef;
+        public int iconResPress;
+
+        public TextView tvTitle;
+        public ImageView ivIcon;
+
+        public TabItemView(Context context, String title, int colorDef, int colorPress,
+                           int iconResDef, int iconResPress) {
+            super(context);
+            this.title = title;
+            this.colorDef = colorDef;
+            this.colorPress = colorPress;
+            this.iconResDef = iconResDef;
+            this.iconResPress = iconResPress;
+            init();
+        }
+
+        /**
+         * 初始化
+         */
+        public void init(){
+            View view = LayoutInflater.from(super.getContext()).inflate(R.layout.item_view_tab, this);
+            tvTitle = (TextView) view.findViewById(R.id.tvTitle);
+            ivIcon = (ImageView) view.findViewById(R.id.ivIcon);
+
+            LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            layoutParams.weight = 1;
+            view.setLayoutParams(layoutParams);
+
+            tvTitle.setText(title);
+
+        }
+
+        /**
+         * 设置状态
+         */
+        public void setStatus(int status){
+            tvTitle.setTextColor(ContextCompat.getColor(super.getContext(), status == PRESS ? colorPress : colorDef));
+            ivIcon.setImageResource(status == PRESS ? iconResPress : iconResDef);
+        }
+    }
+}
+package com.cnlive.gundam.main.ui.widget;
+
+
+public interface FooterViewListener {
+
+    /**
+     * 网络不好的时候想要展示的UI
+     */
+    void onNetChange(boolean isAvailable);
+
+    /**
+     * 正常的loading的View
+     */
+    void onLoadingMore();
+
+    /**
+     * 没有更多数据
+     */
+    void onNoMore(CharSequence message);
+
+    /**
+     *  错误时展示的View
+     */
+    void onError(CharSequence message);
+}
+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();
+    }
+}
+
+package com.cnlive.gundam.main.ui.widget;
+
+
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorRes;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/7/12
+ * <p>
+ * 描述：分割线
+ */
+public class RecyclerSpace extends RecyclerView.ItemDecoration {
+    private int space;
+    private int color = -1;
+    private Drawable mDivider;
+    private Paint mPaint;
+    private int type;
+
+    public int getColor() {
+        return color;
+    }
+
+    public void setColor(@ColorRes int color) {
+        this.color = color;
+    }
+
+    public RecyclerSpace(int space) {
+        this.space = space;
+    }
+
+    public RecyclerSpace(int space, int color) {
+        this.space = space;
+        this.color = color;
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaint.setColor(color);
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setStrokeWidth(space * 2);
+    }
+    public RecyclerSpace(int space, int color,int type) {
+        this.space = space;
+        this.color = color;
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaint.setColor(color);
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setStrokeWidth(space * 2);
+        this.type=type;
+    }
+
+    public RecyclerSpace(int space, Drawable mDivider) {
+        this.space = space;
+        this.mDivider = mDivider;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view,
+                               RecyclerView parent, RecyclerView.State state) {
+        if (parent.getLayoutManager() != null) {
+            if (parent.getLayoutManager() instanceof LinearLayoutManager && !(parent.getLayoutManager() instanceof GridLayoutManager)) {
+                if (((LinearLayoutManager) parent.getLayoutManager()).getOrientation() == LinearLayoutManager.HORIZONTAL) {
+                    outRect.set(space, 0, space, 0);
+                } else {
+                    outRect.set(0, space, 0, space);
+                }
+            } else {
+                outRect.set(space, space, space, space);
+            }
+        }
+
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        super.onDraw(c, parent, state);
+        if (parent.getLayoutManager() != null) {
+            if (parent.getLayoutManager() instanceof LinearLayoutManager && !(parent.getLayoutManager() instanceof GridLayoutManager)) {
+                if (((LinearLayoutManager) parent.getLayoutManager()).getOrientation() == LinearLayoutManager.HORIZONTAL) {
+                    drawHorizontal(c, parent);
+                } else {
+                    drawVertical(c, parent);
+                }
+            } else {
+                if(type==0){
+                    drawGrideview(c, parent);
+                }else{
+                    drawGrideview1(c, parent);
+                }
+            }
+        }
+    }
+
+    //绘制纵向 item 分割线
+
+    private void drawVertical(Canvas canvas, RecyclerView parent) {
+        final int top = parent.getPaddingTop();
+        final int bottom = parent.getMeasuredHeight() - parent.getPaddingBottom();
+        final int childSize = parent.getChildCount();
+        for (int i = 0; i < childSize; i++) {
+            final View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) child.getLayoutParams();
+            final int left = child.getRight() + layoutParams.rightMargin;
+            final int right = left + space;
+            if (mDivider != null) {
+                mDivider.setBounds(left, top, right, bottom);
+                mDivider.draw(canvas);
+            }
+            if (mPaint != null) {
+                canvas.drawRect(left, top, right, bottom, mPaint);
+            }
+        }
+    }
+
+    //绘制横向 item 分割线
+    private void drawHorizontal(Canvas canvas, RecyclerView parent) {
+        int left = parent.getPaddingLeft();
+        int right = parent.getMeasuredWidth() - parent.getPaddingRight();
+        final int childSize = parent.getChildCount();
+        for (int i = 0; i < childSize; i++) {
+            final View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) child.getLayoutParams();
+            int top = child.getBottom() + layoutParams.bottomMargin;
+            int bottom = top + space;
+            if (mDivider != null) {
+                mDivider.setBounds(left, top, right, bottom);
+                mDivider.draw(canvas);
+            }
+            if (mPaint != null) {
+                canvas.drawRect(left, top, right, bottom, mPaint);
+            }
+
+        }
+    }
+
+    //绘制grideview item 分割线 不是填充满的
+    private void drawGrideview(Canvas canvas, RecyclerView parent) {
+        GridLayoutManager linearLayoutManager = (GridLayoutManager) parent.getLayoutManager();
+        int childSize = parent.getChildCount();
+        int other = parent.getChildCount() / linearLayoutManager.getSpanCount() - 1;
+        if (other < 1) {
+            other = 1;
+        }
+        other = other * linearLayoutManager.getSpanCount();
+        if (parent.getChildCount() < linearLayoutManager.getSpanCount()) {
+            other = parent.getChildCount();
+        }
+        int top, bottom, left, right, spancount;
+        spancount = linearLayoutManager.getSpanCount() - 1;
+        for (int i = 0; i < childSize; i++) {
+            final View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) child.getLayoutParams();
+            if (i < other) {
+                top = child.getBottom() + layoutParams.bottomMargin;
+                bottom = top + space;
+                left = (layoutParams.leftMargin + space) * (i + 1);
+                right = child.getMeasuredWidth() * (i + 1) + left + space * i;
+                if (mDivider != null) {
+                    mDivider.setBounds(left, top, right, bottom);
+                    mDivider.draw(canvas);
+                }
+                if (mPaint != null) {
+                    canvas.drawRect(left, top, right, bottom, mPaint);
+                }
+            }
+            if (i != spancount) {
+                top = (layoutParams.topMargin + space) * (i / linearLayoutManager.getSpanCount() + 1);
+                bottom = (child.getMeasuredHeight() + space) * (i / linearLayoutManager.getSpanCount() + 1) + space;
+                left = child.getRight() + layoutParams.rightMargin;
+                right = left + space;
+                if (mDivider != null) {
+                    mDivider.setBounds(left, top, right, bottom);
+                    mDivider.draw(canvas);
+                }
+                if (mPaint != null) {
+                    canvas.drawRect(left, top, right, bottom, mPaint);
+                }
+            } else {
+                spancount += 4;
+            }
+        }
+    }
+
+    /***/
+    private void drawGrideview1(Canvas canvas, RecyclerView parent) {
+        GridLayoutManager linearLayoutManager = (GridLayoutManager) parent.getLayoutManager();
+        int childSize = parent.getChildCount();
+        int top, bottom, left, right,spancount;
+        spancount=linearLayoutManager.getSpanCount();
+        for (int i = 0; i < childSize; i++) {
+            final View child = parent.getChildAt(i);
+            //画横线
+            RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) child.getLayoutParams();
+            top = child.getBottom() + layoutParams.bottomMargin;
+            bottom = top + space;
+            left = layoutParams.leftMargin+child.getPaddingLeft()+space;
+            right = child.getMeasuredWidth() * (i + 1) + left + space * i;
+            if (mDivider != null) {
+                mDivider.setBounds(left, top, right, bottom);
+                mDivider.draw(canvas);
+            }
+            if (mPaint != null) {
+                canvas.drawRect(left, top, right, bottom, mPaint);
+            }
+            //画竖线
+            top = (layoutParams.topMargin + space) * (i / linearLayoutManager.getSpanCount() + 1);
+            bottom = (child.getMeasuredHeight() + space) * (i / linearLayoutManager.getSpanCount() + 1) + space;
+            left = child.getRight() + layoutParams.rightMargin;
+            right = left + space;
+            if (mDivider != null) {
+                mDivider.setBounds(left, top, right, bottom);
+                mDivider.draw(canvas);
+            }
+            if (mPaint != null) {
+                canvas.drawRect(left, top, right, bottom, mPaint);
+            }
+
+            //画上缺失的线框
+            if(i<spancount){
+                top = child.getTop() + layoutParams.topMargin;
+                bottom = top + space;
+                left = (layoutParams.leftMargin + space) * (i + 1);
+                right = child.getMeasuredWidth() * (i + 1) + left + space * i;
+                if (mDivider != null) {
+                    mDivider.setBounds(left, top, right, bottom);
+                    mDivider.draw(canvas);
+                }
+                if (mPaint != null) {
+                    canvas.drawRect(left, top, right, bottom, mPaint);
+                }
+            }
+            if(i%spancount==0){
+                top = (layoutParams.topMargin + space) * (i / linearLayoutManager.getSpanCount() + 1);
+                bottom = (child.getMeasuredHeight() + space) * (i / linearLayoutManager.getSpanCount() + 1) + space;
+                left = child.getLeft() + layoutParams.leftMargin;
+                right = left + space;
+                if (mDivider != null) {
+                    mDivider.setBounds(left, top, right, bottom);
+                    mDivider.draw(canvas);
+                }
+                if (mPaint != null) {
+                    canvas.drawRect(left, top, right, bottom, mPaint);
+                }
+            }
+        }
+    }
+}
 \ No newline at end of file
+package com.cnlive.gundam.main.ui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.cnlive.gundam.R;
+
+
+/**
+ * Created by ZJL on 2017/6/15.
+ */
+public class SimpleFooterView extends BaseFooterView{
+
+    private TextView mText;
+
+    private ProgressBar progressBar;
+
+    public SimpleFooterView(Context context) {
+        this(context, null);
+    }
+
+    public SimpleFooterView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SimpleFooterView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        setLayoutParams(new LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.layout_footer_view, this);
+        progressBar = (ProgressBar) view.findViewById(R.id.footer_view_progressbar);
+        mText = (TextView) view.findViewById(R.id.footer_view_tv);
+    }
+
+
+
+    @Override
+    public void onLoadingMore() {
+        progressBar.setVisibility(VISIBLE);
+        mText.setVisibility(GONE);
+    }
+
+    public void showText(){
+        progressBar.setVisibility(GONE);
+        mText.setVisibility(VISIBLE);
+    }
+
+    /**************文字自行修改或根据传入的参数动态修改****************/
+
+    @Override
+    public void onNoMore(CharSequence message) {
+        showText();
+        mText.setText(message);
+    }
+
+    @Override
+    public void onError(CharSequence message) {
+        showText();
+        mText.setText("啊哦，好像哪里不对劲!");
+    }
+
+    @Override
+    public void onNetChange(boolean isAvailable) {
+        showText();
+        mText.setText("网络连接不通畅!");
+    }
+}
+package com.cnlive.gundam.main.ui.widget;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.GridLayoutManager.SpanSizeLookup;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.LayoutManager;
+import android.support.v7.widget.RecyclerView.OnScrollListener;
+import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.cnlive.gundam.R;
+
+
+/**
+ * Created by ZJL on 2017/6/15.
+ */
+
+public class SwipeRecyclerView extends FrameLayout
+                implements SwipeRefreshLayout.OnRefreshListener{
+
+    private View mEmptyView;
+    private BaseFooterView mFootView;
+    private RecyclerView recyclerView;
+    private SwipeRefreshLayout mRefreshLayout;
+
+    private LayoutManager mLayoutManager;
+    private OnLoadListener mListener;
+    private SpanSizeLookup mSpanSizeLookup;
+    private DataObserver mDataObserver;
+    private WrapperAdapter mWrapperAdapter;
+
+    private boolean isEmptyViewShowing;
+    private boolean isLoadingMore;
+    private boolean isLoadMoreEnable;
+    private boolean isRefreshEnable;
+
+    private int lastVisiablePosition = 0;
+    private StickyListener mStickyListener;
+    private int fistVisiblePoisiton;
+
+    public SwipeRecyclerView(Context context) {
+        this(context, null);
+    }
+
+    public SwipeRecyclerView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SwipeRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setupSwipeRecyclerView();
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private void setupSwipeRecyclerView() {
+
+        isEmptyViewShowing = false;
+        isRefreshEnable = true;
+        isLoadingMore = false;
+        isLoadMoreEnable = true;
+
+        mFootView = new SimpleFooterView(getContext());
+
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.layout_swipe_recyclerview, this);
+        mRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.SwipeRefreshLayout);
+        recyclerView = (RecyclerView) view.findViewById(R.id.RecyclerView);
+        mLayoutManager = recyclerView.getLayoutManager();
+
+        mRefreshLayout.setOnRefreshListener(this);
+        recyclerView.setOnScrollListener(new OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+            }
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                // do nothing if load more is not enable or refreshing or loading more
+                if(mLayoutManager instanceof LinearLayoutManager){
+                    fistVisiblePoisiton=((LinearLayoutManager)mLayoutManager).findFirstVisibleItemPosition();
+                    if(fistVisiblePoisiton>=2&&mStickyListener!=null){
+                        mStickyListener.onSticky(true);
+                    }else{
+                        mStickyListener.onSticky(false);
+                    }
+                }
+                if(!isLoadMoreEnable || isRefreshing() || isLoadingMore){
+                    return;
+                }
+                //get the lastVisiablePosition
+                mLayoutManager = recyclerView.getLayoutManager();
+
+                if(mLayoutManager instanceof LinearLayoutManager){
+                    lastVisiablePosition = ((LinearLayoutManager)mLayoutManager).findLastVisibleItemPosition();
+                }else if(mLayoutManager instanceof GridLayoutManager){
+                    lastVisiablePosition = ((GridLayoutManager)mLayoutManager).findLastCompletelyVisibleItemPosition();
+                }else if(mLayoutManager instanceof StaggeredGridLayoutManager){
+                    int[] into = new int[((StaggeredGridLayoutManager) mLayoutManager).getSpanCount()];
+                    ((StaggeredGridLayoutManager) mLayoutManager).findLastVisibleItemPositions(into);
+                    lastVisiablePosition = findMax(into);
+                }
+
+                int childCount = mWrapperAdapter == null ? 0 : mWrapperAdapter.getItemCount();
+                if(childCount > 1 && lastVisiablePosition == childCount - 1){
+
+                    if(mListener != null){
+                        isLoadingMore = true;
+                        mListener.onLoadMore();
+                    }
+                }
+            }
+        });
+    }
+
+    private int findMax(int[] lastPositions) {
+        int max = lastPositions[0];
+        for (int value : lastPositions) {
+            if (value > max) {
+                max = value;
+            }
+        }
+        return max;
+    }
+
+    /**
+     * set is enable pull to refresh
+     * @param refreshEnable
+     */
+    public void setRefreshEnable(boolean refreshEnable){
+        isRefreshEnable = refreshEnable;
+        mRefreshLayout.setEnabled(isRefreshEnable);
+    }
+
+    public boolean getRefreshEnable(){
+        return isRefreshEnable;
+    }
+
+    /**
+     * set is loading more enable
+     * @param loadMoreEnable
+     *              if true when recyclerView scroll to bottom load more action will be trigger
+     */
+    public void setLoadMoreEnable(boolean loadMoreEnable) {
+        if(!loadMoreEnable){
+            stopLoadingMore();
+        }
+        isLoadMoreEnable = loadMoreEnable;
+    }
+
+    public boolean getLoadMoreEnable(){
+        return isLoadMoreEnable;
+    }
+
+    /**
+     * get is refreshing
+     * @return
+     */
+    public boolean isRefreshing(){
+        return mRefreshLayout.isRefreshing();
+    }
+
+    /**
+     * get is loading more
+     * @return
+     */
+    public boolean isLoadingMore(){
+        return isLoadingMore;
+    }
+
+    /**
+     * is empty view showing
+     * @return
+     */
+    public boolean isEmptyViewShowing(){
+        return isEmptyViewShowing;
+    }
+
+    /**
+     * you may need set some other attributes of swipeRefreshLayout
+     * @return
+     *     swipeRefreshLayout
+     */
+    public SwipeRefreshLayout getSwipeRefreshLayout(){
+        return mRefreshLayout;
+    }
+
+    /**
+     * you may need set some other attributes of RecyclerView
+     * @return
+     *     RecyclerView
+     */
+    public RecyclerView getRecyclerView(){
+        return recyclerView;
+    }
+
+    /**
+     * set load more listener
+     * @param listener
+     */
+    public void setOnLoadListener(OnLoadListener listener){
+        mListener = listener;
+    }
+
+    /**
+     * support for GridLayoutManager
+     * @param spanSizeLookup
+     */
+    public void setSpanSizeLookup(SpanSizeLookup spanSizeLookup){
+        this.mSpanSizeLookup = spanSizeLookup;
+    }
+
+    /**
+     * set the footer view
+     * @param footerView
+     *        the view to be showing when pull up
+     */
+    public void setFooterView(BaseFooterView footerView){
+        if(footerView != null) {
+            this.mFootView = footerView;
+        }
+    }
+
+    /**
+     * set a empty view like listview
+     * @param emptyView
+     *        the view to be showing when the data set size is zero
+     */
+    public void setEmptyView(View emptyView){
+        if(mEmptyView != null){
+            removeView(mEmptyView);
+        }
+        this.mEmptyView = emptyView;
+
+        if(mDataObserver != null) {
+            mDataObserver.onChanged();
+        }
+    }
+
+    /**
+     * set adapter to recyclerView
+     * @param adapter
+     */
+    public void setAdapter(RecyclerView.Adapter adapter){
+        if(adapter != null) {
+            if(mDataObserver == null){
+                mDataObserver = new DataObserver();
+            }
+            mWrapperAdapter = new WrapperAdapter(adapter);
+            recyclerView.setAdapter(mWrapperAdapter);
+            adapter.registerAdapterDataObserver(mDataObserver);
+            mDataObserver.onChanged();
+        }
+    }
+
+    /**
+     * refresh or load more completed
+     */
+    public void complete(){
+        mRefreshLayout.setRefreshing(false);
+        stopLoadingMore();
+    }
+
+    /**
+     * set refreshing
+     * if you want load data when first in, you can setRefreshing(true)
+     * after {@link #setOnLoadListener(OnLoadListener)}
+     * @param refreshing
+     */
+    public void setRefreshing(boolean refreshing){
+        mRefreshLayout.setRefreshing(refreshing);
+        if(refreshing && !isLoadingMore && mListener != null){
+            mListener.onRefresh();
+        }
+    }
+
+    /**
+     * stop loading more without animation
+     */
+    public void stopLoadingMore(){
+        isLoadingMore = false;
+        if(mWrapperAdapter != null) {
+            mWrapperAdapter.notifyItemRemoved(mWrapperAdapter.getItemCount());
+        }
+    }
+    
+    /**
+     * call method {@link OnLoadListener#onRefresh()}
+     */
+    @Override
+    public void onRefresh() {
+        if(mListener != null){
+
+            //reset footer view status loading
+            if(mFootView != null){
+                mFootView.onLoadingMore();
+            }
+            mListener.onRefresh();
+        }
+    }
+
+    public void onNetChange(boolean isAvailable) {
+        if(mFootView != null){
+            mFootView.onNetChange(isAvailable);
+        }
+    }
+
+    public void onLoadingMore() {
+        if(mFootView != null){
+            mFootView.onLoadingMore();
+        }
+    }
+
+    public void onNoMore(CharSequence message) {
+        if(mFootView != null){
+            mFootView.onNoMore(message);
+        }
+    }
+
+    public void onError(CharSequence message) {
+        if(mFootView != null){
+            mFootView.onError(message);
+        }
+    }
+
+
+    private class WrapperAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>{
+
+        public static final int TYPE_FOOTER = 0x100;
+
+        RecyclerView.Adapter<RecyclerView.ViewHolder> mInnerAdapter;
+
+        public WrapperAdapter(RecyclerView.Adapter<RecyclerView.ViewHolder> adapter){
+            this.mInnerAdapter = adapter;
+        }
+
+        public boolean isLoadMoreItem(int position){
+            return isLoadMoreEnable && position == getItemCount() - 1;
+        }
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            if(TYPE_FOOTER == viewType){
+                return new FooterViewHolder(mFootView);
+            }
+            return mInnerAdapter.onCreateViewHolder(parent, viewType);
+        }
+
+        @Override
+        public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+            if(isLoadMoreItem(position)){
+                return;
+            }
+            mInnerAdapter.onBindViewHolder(holder, position);
+        }
+
+
+        @Override
+        public int getItemViewType(int position) {
+            if(isLoadMoreItem(position)){
+                return TYPE_FOOTER;
+            }else{
+                return mInnerAdapter.getItemViewType(position);
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            int count = mInnerAdapter == null ? 0 : mInnerAdapter.getItemCount();
+
+            //without loadingMore when adapter size is zero
+            if(count == 0){
+                return 0;
+            }
+            return isLoadMoreEnable ? count + 1 : count;
+        }
+
+        @Override
+        public long getItemId(int position) {
+           return mInnerAdapter.getItemId(position);
+        }
+
+        @Override
+        public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
+            ViewGroup.LayoutParams lp = holder.itemView.getLayoutParams();
+            if (lp != null
+                    && lp instanceof StaggeredGridLayoutManager.LayoutParams
+                    && isLoadMoreItem(holder.getLayoutPosition()))
+            {
+                StaggeredGridLayoutManager.LayoutParams p = (StaggeredGridLayoutManager.LayoutParams) lp;
+                p.setFullSpan(true);
+            }
+            mInnerAdapter.onViewAttachedToWindow(holder);
+        }
+
+        @Override
+        public void onViewDetachedFromWindow(RecyclerView.ViewHolder holder) {
+            mInnerAdapter.onViewDetachedFromWindow(holder);
+        }
+
+        @Override
+        public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+            LayoutManager manager = recyclerView.getLayoutManager();
+            if (manager instanceof GridLayoutManager) {
+                final GridLayoutManager gridManager = ((GridLayoutManager) manager);
+                gridManager.setSpanSizeLookup(new SpanSizeLookup() {
+                    @Override
+                    public int getSpanSize(int position) {
+                        boolean isLoadMore = isLoadMoreItem(position);
+                        if(mSpanSizeLookup != null && !isLoadMore){
+                            return mSpanSizeLookup.getSpanSize(position);
+                        }
+                        return isLoadMore ? gridManager.getSpanCount() : 1;
+                    }
+                });
+            }
+            mInnerAdapter.onAttachedToRecyclerView(recyclerView);
+        }
+
+        @Override
+        public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
+            mInnerAdapter.onDetachedFromRecyclerView(recyclerView);
+        }
+
+        @Override
+        public boolean onFailedToRecycleView(RecyclerView.ViewHolder holder) {
+            return mInnerAdapter.onFailedToRecycleView(holder);
+        }
+
+        @Override
+        public void registerAdapterDataObserver(RecyclerView.AdapterDataObserver observer) {
+            mInnerAdapter.registerAdapterDataObserver(observer);
+        }
+
+        @Override
+        public void unregisterAdapterDataObserver(RecyclerView.AdapterDataObserver observer) {
+            mInnerAdapter.unregisterAdapterDataObserver(observer);
+        }
+
+        @Override
+        public void onViewRecycled(RecyclerView.ViewHolder holder) {
+            mInnerAdapter.onViewRecycled(holder);
+        }
+    }
+
+    /**
+     * ViewHolder of footerView
+     */
+    private class FooterViewHolder extends RecyclerView.ViewHolder {
+        public FooterViewHolder(View itemView) {
+            super(itemView);
+        }
+    }
+
+    /**
+     * a inner class used to monitor the dataSet change
+     * <p>
+     * because wrapperAdapter do not know when wrapperAdapter.mInnerAdapter
+     * <p>
+     * dataSet changed, these method are final
+     */
+    class DataObserver extends RecyclerView.AdapterDataObserver{
+
+        @Override
+        public void onChanged() {
+            super.onChanged();
+            RecyclerView.Adapter adapter = recyclerView.getAdapter();
+            if(adapter != null && mEmptyView != null){
+
+                int count = 0;
+                if(isLoadMoreEnable && adapter.getItemCount() != 0){
+                    count ++;
+                }
+                if(adapter.getItemCount() == count){
+                    isEmptyViewShowing = true;
+                    if(mEmptyView.getParent() == null){
+                        LayoutParams params = new LayoutParams(
+                                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                        params.gravity = Gravity.CENTER;
+
+                        addView(mEmptyView, params);
+                    }
+
+                    recyclerView.setVisibility(GONE);
+                    mEmptyView.setVisibility(VISIBLE);
+                }else{
+                    isEmptyViewShowing = false;
+                    mEmptyView.setVisibility(GONE);
+                    recyclerView.setVisibility(VISIBLE);
+                }
+            }
+            mWrapperAdapter.notifyDataSetChanged();
+        }
+
+        @Override
+        public void onItemRangeChanged(int positionStart, int itemCount) {
+            super.onItemRangeChanged(positionStart, itemCount);
+            mWrapperAdapter.notifyItemRangeChanged(positionStart, itemCount);
+        }
+
+        @Override
+        public void onItemRangeChanged(int positionStart, int itemCount, Object payload) {
+            super.onItemRangeChanged(positionStart, itemCount, payload);
+            mWrapperAdapter.notifyItemRangeChanged(positionStart, itemCount, payload);
+        }
+
+        @Override
+        public void onItemRangeInserted(int positionStart, int itemCount) {
+            super.onItemRangeInserted(positionStart, itemCount);
+            mWrapperAdapter.notifyItemRangeInserted(positionStart, itemCount);
+        }
+
+        @Override
+        public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
+            super.onItemRangeMoved(fromPosition, toPosition, itemCount);
+           mWrapperAdapter.notifyItemRangeRemoved(fromPosition, itemCount);
+        }
+
+        @Override
+        public void onItemRangeRemoved(int positionStart, int itemCount) {
+            super.onItemRangeRemoved(positionStart, itemCount);
+            mWrapperAdapter.notifyItemRangeRemoved(positionStart, itemCount);
+        }
+
+    }
+    public void setStickyListener(StickyListener stickyListener){
+        mStickyListener=stickyListener;
+    }
+    public interface OnLoadListener {
+
+        void onRefresh();
+
+        void onLoadMore();
+    }
+    public interface StickyListener{
+        void onSticky(boolean isVisible);
+    }
+}
@@ -14,6 +14,7 @@ import com.cnlive.gundam.databinding.FragmentPersonalEditBinding;
 import com.cnlive.gundam.user.activity.UserPersonalActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
+import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.libs.user.IUserService;
 import com.cnlive.libs.user.UserUtil;
 import com.cnlive.libs.user.model.UserData;
@@ -130,6 +131,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
             updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
         } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+            ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
             UserService userService = UserService.getInstance(getActivity());
             userService.clearUser();
             getActivity().finish();
@@ -147,6 +149,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setActiveAccountInfo(userData.getData());
                 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
                     UserService userService = UserService.getInstance(getActivity());
                     userService.clearUser();
                     getActivity().finish();
@@ -31,6 +31,7 @@ import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.PersonalData;
 import com.cnlive.gundam.user.model.User;
 import com.cnlive.gundam.user.util.PictureUtil;
+import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.gundam.user.view.SelectPopupWindow;
 import com.cnlive.libs.user.IUserService;
 import com.cnlive.libs.user.UserUtil;
@@ -284,6 +285,7 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
             updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
         } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+            ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
             UserService userService = UserService.getInstance(getActivity());
             userService.clearUser();
             getActivity().finish();
@@ -303,6 +305,7 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
                     user = userService.getActiveAccountInfo();
                     initData();
                 } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    ToastUtil.show(getActivity(), getString(R.string.user_token_invalid));
                     UserService userService = UserService.getInstance(getActivity());
                     userService.clearUser();
                     getActivity().finish();
@@ -9,13 +9,20 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.model.MsgEvent;
 import com.cnlive.gundam.main.model.VideoListProgram;
+import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
+import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.gundam.video.fragment.PlayerLiveFragment;
 import com.cnlive.gundam.video.fragment.PlayerUgcLiveFragment;
 import com.cnlive.gundam.video.fragment.PlayerUgcVodFragment;
 import com.cnlive.gundam.video.fragment.PlayerVodFragment;
 import com.cnlive.gundam.video.utils.PlayerUtils;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 /**
  * Created by gujun on 2017/4/5.
  * screenDirect //0：竖向  1;横向 ugcLive ugcVod 播放页面用到了
@@ -28,11 +35,14 @@ public class PlayerActivity extends AppCompatActivity {
     //默认横屏
     private int screenDirect = 1;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_player);
         addData(getIntent());
+
+
     }
     @Override
@@ -80,11 +90,20 @@ public class PlayerActivity extends AppCompatActivity {
     @Override
     public void onBackPressed() {
+
         if (!(PlayerUtils.isPortrait(this)) && (fragment instanceof PlayerLiveFragment || fragment instanceof PlayerVodFragment)) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else if (SharedPreferencesHelper.getInstance(this).getIntValue("ishow") == 0) {
+            EventBus.getDefault().post(new MsgEvent());
         } else {
             super.onBackPressed();
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+    }
 }
@@ -23,10 +23,10 @@ import java.util.List;
  */
 public class CommentAdapter extends RecyclerView.Adapter<CommentAdapter.CommentHolder> {
-    protected List<CommentItem> mItems = new ArrayList<CommentItem>();
-    protected OnImageViewClick onImageViewClick;
+    private List<CommentItem> mItems = new ArrayList<CommentItem>();
+    private OnImageViewClick onImageViewClick;
     Context context;
-    private final LayoutInflater mLayoutInflater;
+    private  LayoutInflater mLayoutInflater;
     private CommentHolder commentHolder;
     public CommentAdapter(Context context) {
@@ -36,10 +36,19 @@ public class CommentAdapter extends RecyclerView.Adapter&lt;CommentAdapter.CommentH
     }
     public void addItems(List<CommentItem> items) {
+
         mItems.addAll(items);
         notifyDataSetChanged();
     }
+    public void addItem(CommentItem item) {
+
+        mItems.add(0,item);
+
+        notifyDataSetChanged();
+    }
+
+
     public void refreshItems(List<CommentItem> items) {
         mItems.clear();
         mItems.addAll(items);
@@ -58,10 +67,17 @@ public class CommentAdapter extends RecyclerView.Adapter&lt;CommentAdapter.CommentH
         return commentHolder;
     }
+
+
+
+
     @Override
     public void onBindViewHolder(CommentHolder holder, int position) {
-        final CommentItem commentItem = mItems.get(position);
+
+         final CommentItem commentItem = mItems.get(position);
+
+
         Glide.with(context).load(commentItem.getFacepath()).into(commentHolder.img_head);
         commentHolder.nick_name.setText(commentItem.getUid());
         commentHolder.comment_message.setText(commentItem.getContent());
@@ -87,17 +103,18 @@ public class CommentAdapter extends RecyclerView.Adapter&lt;CommentAdapter.CommentH
         this.onImageViewClick = onImageViewClick;
     }
+
     public interface OnImageViewClick {
         void praiseComment(CommentItem commentItem);
     }
     class CommentHolder extends RecyclerView.ViewHolder {
-        public final TextView nick_name;
-        public final TextView comment_message;
-        public final TextView comment_good_count;
-        public final ImageView good_imv1;
-        public final ImageView img_head;
+        public  TextView nick_name;
+        public  TextView comment_message;
+        public  TextView comment_good_count;
+        public  ImageView good_imv1;
+        public  ImageView img_head;
         public CommentHolder(View itemView) {
             super(itemView);
@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import com.cnlive.gundam.databinding.ItemListRightBinding;
 import com.cnlive.gundam.video.model.MessageContent;
@@ -62,17 +63,18 @@ 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()){
             ItemListRightBinding binding1 = (ItemListRightBinding) binding;
             LinearLayout rightLin = binding1.rightLin;
-            LinearLayout leftLin = binding1.leftLin;
+            RelativeLayout leftLin = binding1.leftLin;
             leftLin.setVisibility(View.VISIBLE);
             rightLin.setVisibility(View.INVISIBLE);
         }else {
             ItemListRightBinding binding1 = (ItemListRightBinding) binding;
-            LinearLayout leftLin = binding1.leftLin;
+            RelativeLayout leftLin = binding1.leftLin;
             LinearLayout rightLin = binding1.rightLin;
             rightLin.setVisibility(View.VISIBLE);
+package com.cnlive.gundam.video.fragment;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.FragmentVodDetialBinding;
+import com.cnlive.gundam.main.model.CommentTitleViewModel;
+import com.cnlive.gundam.main.model.CommentViewModel;
+import com.cnlive.gundam.main.model.VodDetailModel;
+import com.cnlive.gundam.main.presenter.VodDetailPresenter;
+import com.cnlive.gundam.main.presenter.view.VodDetialView;
+import com.cnlive.gundam.main.ui.adapter.mul.BaseMulTypeBindingAdapter;
+import com.cnlive.gundam.main.ui.widget.SwipeRecyclerView;
+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.video.fragment.chat.CommentFragment;
+import com.cnlive.gundam.video.utils.ToastUtil;
+import com.cnlive.libs.util.comment.CommentUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/7/12
+ * <p>
+ * 描述：  评论界面
+ */
+
+public class CommentDetailsFragment extends Fragment implements VodDetialView {
+
+    private boolean loadMoreEnable = true;
+    FragmentVodDetialBinding binding;
+    private View inflate;
+    private InputUtil inputUtil;
+    private UserService userService;
+
+    private CommentUtil commentUtil = new CommentUtil();
+
+
+    BaseMulTypeBindingAdapter adapter;
+    List mDatas = new ArrayList();
+
+    private String programID;
+    private String mContentId;
+    private String userID;
+    User user;
+    int uid;
+    VodDetailPresenter presenter = new VodDetailPresenter(this);
+
+    public static CommentDetailsFragment newInstance(String programID) {
+
+        Bundle args = new Bundle();
+        CommentDetailsFragment fragment = new CommentDetailsFragment();
+        args.putString("programID", programID);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_vod_detial, container, false);
+
+        userService = UserService.getInstance(getActivity());
+        if (presenter == null) {
+            presenter = new VodDetailPresenter(this);
+        }
+        //绑定view
+
+        return binding.getRoot();
+    }
+
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
+        if (uid != 0) {
+            userID = String.valueOf(uid);
+        } else {
+            userID = String.valueOf(new Random().nextInt(99) + 1);
+        }
+
+        programID = getArguments().getString("programID");
+        mContentId = programID;
+        binding.srvVodDetail.getSwipeRefreshLayout()
+                .setColorSchemeColors(getResources().getColor(R.color.colorPrimary));
+        binding.llComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //弹出输入框
+                if (TextUtils.isEmpty(userService.getActiveAccountInfo().getUid() + "")) {
+                    ToastUtil.showToast("请先登录");
+                    return;
+                }
+
+                showInput(binding.llVodDetail);
+            }
+        });
+
+        presenter.getData();
+
+    }
+
+
+    private int page = 1;
+    private boolean isLoad = false;
+
+    private EditText mMsgEditText;
+    private PopupWindow mInputPopupWindow;
+
+    private void showInput(View view) {
+        // 加载popupWindow的布局
+        View contentView = LayoutInflater.from(getActivity()).inflate(R.layout.layout_chat_input, new LinearLayout(getActivity()), false);
+        contentView.findViewById(R.id.click_view).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mMsgEditText.setText("");
+                mInputPopupWindow.dismiss();
+            }
+        });
+        mMsgEditText = (EditText) contentView.findViewById(R.id.chat_content);
+        mMsgEditText.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+                    if (inputMethodManager.isActive()) {
+                        inputMethodManager.hideSoftInputFromWindow(v.getApplicationWindowToken(), 0);
+                    }
+                    sendMessage(mMsgEditText.getText().toString());
+                    mMsgEditText.setText("");
+                    mInputPopupWindow.dismiss();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        if (mInputPopupWindow != null) mInputPopupWindow.dismiss();
+
+        mInputPopupWindow = new PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+        mInputPopupWindow.setTouchable(true);
+        mInputPopupWindow.setTouchInterceptor(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_OUTSIDE)
+                    mInputPopupWindow.dismiss();
+                return false;
+            }
+        });
+        // 设置popupWindow 点击popupWindow外的地方 生效
+        mInputPopupWindow.setOutsideTouchable(true);
+        // 设置popupWindow 背景
+        mInputPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        mInputPopupWindow.setFocusable(true); //设置获取焦点
+        mInputPopupWindow.setAnimationStyle(R.style.animation);
+        mInputPopupWindow.setSoftInputMode(PopupWindow.INPUT_METHOD_NEEDED);
+        mInputPopupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        mInputPopupWindow.showAtLocation(view, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 0);
+        mInputPopupWindow.update();
+
+        mMsgEditText.requestFocus();
+        mInputPopupWindow.setSoftInputMode(PopupWindow.INPUT_METHOD_NEEDED);
+        mInputPopupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        InputMethodManager imm = (InputMethodManager) getActivity().getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(1000, InputMethodManager.HIDE_NOT_ALWAYS);
+    }
+
+    private void sendMessage(final String message) {
+
+        String s1 = userService.getActiveAccountInfo().getUid() + "";
+        //TODO 添加评论
+        presenter.addCommment(mContentId, s1, message);
+    }
+
+    @Override
+    public void onLoadDataComplete(VodDetailModel model, List datas) {
+        mDatas = datas;
+        adapter = new BaseMulTypeBindingAdapter(getActivity(), mDatas);
+        adapter.setItemPresenter(new OnBindItemClick());
+
+        binding.srvVodDetail.getRecyclerView().setLayoutManager(new LinearLayoutManager(getActivity()));
+        binding.srvVodDetail.setAdapter(adapter);
+        binding.srvVodDetail.setOnLoadListener(new SwipeRecyclerView.OnLoadListener() {
+            @Override
+            public void onRefresh() {
+                presenter.getComment(false, mContentId, page);
+            }
+
+            @Override
+            public void onLoadMore() {
+                isLoad = true;
+                if (page != 1 && loadMoreEnable)
+                    presenter.getComment(false, mContentId, page);
+            }
+
+        });
+        binding.srvVodDetail.setRefreshEnable(true);
+        binding.srvVodDetail.setStickyListener(new SwipeRecyclerView.StickyListener() {
+            @Override
+            public void onSticky(boolean isVisible) {
+                if (isVisible) {
+                    binding.llComment.setVisibility(View.VISIBLE);
+                } else {
+                    binding.llComment.setVisibility(View.GONE);
+                }
+            }
+        });
+        presenter.getComment(false, mContentId, page);
+    }
+
+    @Override
+    public void onLoadCommentComplete(List mDatas, boolean isScroll) {
+        CommentTitleViewModel commentTitleViewModel = (CommentTitleViewModel) this.mDatas.get(0);
+        binding.commentTitleTvNums.setText(commentTitleViewModel.getCount() + "");
+        if (isLoad) {
+            binding.srvVodDetail.stopLoadingMore();
+            isLoad = false;
+        }
+
+        if (binding.srvVodDetail.isRefreshing()) {
+            binding.srvVodDetail.complete();
+        }
+        if (mDatas == null) {
+            binding.srvVodDetail.onNoMore("快来抢沙发喽~");
+            loadMoreEnable = false;
+        } else if (isScroll) {
+            adapter.add(1, mDatas.get(0));
+            binding.srvVodDetail.getRecyclerView().scrollToPosition(1);
+        } else {
+            adapter.addDatas(mDatas);
+            if (mDatas.size() < 2) {
+                binding.srvVodDetail.onNoMore("暂无更多评论~");
+                loadMoreEnable = false;
+            }
+            page++;
+
+        }
+    }
+
+
+    public class OnBindItemClick {
+
+        public void onPraiseClick(final CommentViewModel commentViewModel) {
+            if (true) {//判断登录
+                //TODO 点赞评论
+                String uid = String.valueOf(userService.getActiveAccountInfo().getUid());
+                presenter.toPraise(commentViewModel, mContentId, uid);
+
+            } else {
+                ToastUtil.showToast("请登录");
+            }
+        }
+
+        public void onCommentClick() {
+            //弹出输入框
+            if (TextUtils.isEmpty(userService.getActiveAccountInfo().getUid() + "")) {
+                ToastUtil.showToast("请先登录");
+                return;
+            }
+
+            showInput(binding.llVodDetail);
+        }
+    }
+
+
+}
@@ -48,7 +48,7 @@ public class PlayerVodFragment extends Fragment implements PlayerAccelerometerSe
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_player_vod, container, false);
         VideoListProgram program = (VideoListProgram) getArguments().getSerializable("program");
-        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, CommentFragment.newInstance(program.getvId()+""), "commentFragment").commit();
+        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout, CommentDetailsFragment.newInstance(program.getvId()+""), "commentFragment").commit();
         return binding.getRoot();
     }
@@ -8,6 +8,7 @@ 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;
@@ -21,10 +22,15 @@ import com.bumptech.glide.Glide;
 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;
@@ -36,8 +42,11 @@ import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNUserInfo;
 import com.cnlive.libs.video.barrage.BarrageLayout;
-import java.util.ArrayList;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import java.util.ArrayList;
 /**
@@ -78,27 +87,32 @@ 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);
         if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
             requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE}, PERMISSION_REQUEST_CODE);
-        }else{
+        } else {
             initChat();
         }
     }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if(requestCode == PERMISSION_REQUEST_CODE){
+        if (requestCode == PERMISSION_REQUEST_CODE) {
             if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 initChat();
             } else {
-                ToastUtil.show(getActivity(),"使用聊天功能,请通过权限审核");
+                ToastUtil.show(getActivity(), "使用聊天功能,请通过权限审核");
             }
         }
     }
@@ -121,6 +135,8 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
                 }
             }
         });
+
+
     }
     @BindingAdapter("android:src")
@@ -130,10 +146,12 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     @BindingAdapter({"imageUrl"})
     public static void loadImage(ImageView imageView, String url) {
-        if (url == null) {
-            imageView.setImageResource(R.mipmap.ic_launcher);
+        if (url == null || url.equals("")) {
+//            imageView.setImageResource(R.mipmap.ic_launcher);
+
+            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);
         }
     }
@@ -143,11 +161,11 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
         ChatUtil.disconnect(false);
+        EventBus.getDefault().unregister(this);
     }
     private void initChat() {
@@ -178,11 +196,14 @@ 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);
                 fragmentChatBinding.rlGift.setVisibility(i);
             }
         });
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 6);
         fragmentChatBinding.recyclerGift.setLayoutManager(gridLayoutManager);
+        fragmentChatBinding.recyclerGift.addItemDecoration(new RecyclerSpace(10));
+
         fragmentChatBinding.setGiftAdapter(new GiftAdapter(roomId, getActivity(), giftArray, R.layout.fragment_gift_receycel, BR.dataBean));
     }
@@ -202,6 +223,9 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         }
     }
+    /**
+     * 设置礼物
+     */
     private void initGift() {
         fragmentChatBinding.sendMessage.setOnClickListener(new View.OnClickListener() {
@@ -218,30 +242,61 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
     }
+    /**
+     * 初始化监听事件
+     */
     private void initListener() {
         barrageBottom();
         initMessageAdapter();
         messageContentInfo = new MessageContentInfo();
-        messageContentInfo.setOnReceiveAndSendListener( roomId, getActivity(), ChatRoomFragment.this);
+        messageContentInfo.setOnReceiveAndSendListener(roomId, getActivity(), ChatRoomFragment.this);
     }
     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;
+        this.messageContents = messageContents;
         messageContentCommonAdapter.addItems((messageContents));
     }
+    /**
+     * 弹幕
+     *
+     * @param barrageBaseMessage
+     */
     @Override
     public void onbarrage(BarrageBaseMessage barrageBaseMessage) {
         barrageLayout.addMessage(barrageBaseMessage);
     }
+
+    //在处理礼物返回问题
+
+
+    /**
+     * 接收页面   {@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);
+    }
+
 }
@@ -14,6 +14,7 @@ import android.widget.Toast;
 import com.cnlive.gundam.R;
 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.video.adpter.CommentAdapter;
 import com.cnlive.libs.util.chat.model.ErrorMessage;
@@ -33,7 +34,7 @@ import java.util.Random;
  * @time 2017/6/29  19:44
  * @desc ${TODD}
  */
-public class CommentFragment extends Fragment implements View.OnClickListener, CommentAdapter.OnImageViewClick ,InputUtil.SendCommentCallBack{
+public class CommentFragment extends Fragment implements View.OnClickListener, CommentAdapter.OnImageViewClick, InputUtil.SendCommentCallBack {
     private View inflate;
@@ -43,7 +44,7 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
         Bundle args = new Bundle();
         CommentFragment fragment = new CommentFragment();
-        args.putString("programID",programID);
+        args.putString("programID", programID);
         fragment.setArguments(args);
         return fragment;
     }
@@ -53,8 +54,9 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
     private CommentUtil commentUtil;
     private CommentAdapter commentAdapter;
     private RecyclerView recyclerView;
-    private String programID ;
+    private String programID;
     private String userID;
+    User user;
     @Nullable
     @Override
@@ -71,21 +73,26 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
         initUI();
     }
+    int uid;
+
     private void initDate() {
+        user = UserService.getInstance(getActivity()).getActiveAccountInfo();
         inputUtil = new InputUtil(getActivity());
         inputUtil.setonSendCommentCallBack(this);
-        int uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
-        if(uid!=0){
-            userID=String.valueOf(uid);
-        }else {
-            userID=String.valueOf(new Random().nextInt(100));}
+        uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
+        if (uid != 0) {
+            userID = String.valueOf(uid);
+        } else {
+            userID = String.valueOf(new Random().nextInt(99) + 1);
+        }
+
     }
     private void initUI() {
-        programID= getArguments().getString("programID");
+        programID = getArguments().getString("programID");
         commentAdapter = new CommentAdapter(getActivity());
         recyclerView = (RecyclerView) getActivity().findViewById(R.id.comment_content);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -109,7 +116,7 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.input :
+            case R.id.input:
                 inputUtil.showInput(v);
                 break;
         }
@@ -117,6 +124,8 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
     }
+    //评论的数据
+    List<CommentItem> comments;
     public void getCommentMesaage() {
         commentUtil.readAllComment(programID, 1, 10, new CommentListCallback() {
@@ -124,12 +133,10 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
             public void onResponse(CommentPage commentPage) {
                 if (commentPage.getData() != null) {
                     Log.v("commentPage", commentPage.getErrorMessage() + "");
-                    List<CommentItem> comments = commentPage.getData().getComments();
-                    if(comments==null)return;
+                    comments = commentPage.getData().getComments();
                     recyclerView.setAdapter(commentAdapter);
+                    if (comments == null) return;
                     commentAdapter.addItems(comments);
-
-
                 }
             }
         });
@@ -147,13 +154,21 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
     @Override
     public void praiseComment(CommentItem commentItem) {
+
         commentUtil.praiseComment(programID, userID, commentItem.getId(), new CommentCallback() {
             @Override
             public void onResponse(ErrorMessage errorMessage) {
                 if (errorMessage != null && errorMessage.getErrorCode().equals("0")) {
                     Toast.makeText(getActivity(), "点赞成功", Toast.LENGTH_SHORT).show();
-                    commentAdapter.clearItems();
-                    getCommentMesaage();
+
+//                  String intPrise=  commentItem.getPraise();
+//                  int prise=  Integer.parseInt(intPrise)+1;
+//                    commentItem.setPraise(prise+"");
+//                    commentAdapter.notifyDataSetChanged();
+
+//                    commentAdapter.clearItems();
+//                    getCommentMesaage();
+
                 } else Toast.makeText(getActivity(), "点赞失败", Toast.LENGTH_SHORT).show();
             }
@@ -162,7 +177,8 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
     @Override
-    public void sendComment(String s) {
+    public void sendComment(final String s) {
+
         commentUtil.insertComment(programID, userID, s, new CommentCallback() {
             @Override
             public void onResponse(ErrorMessage errorMessage) {
@@ -170,11 +186,29 @@ public class CommentFragment extends Fragment implements View.OnClickListener, C
                     Toast.makeText(getActivity(), "评论成功", Toast.LENGTH_SHORT).show();
                     edit_comment.setText("我来说两句.....");
-                    commentAdapter.clearItems();
-                    getCommentMesaage();
+                    CommentItem addItem = new CommentItem();
+                    if (user.getUid() == 0) {
+                        //表示游客模式
+                        addItem.setContent(s);
+                        addItem.setId(userID);
+                        addItem.setPraise("0");
+                        addItem.setFacepath("https://yweb0.cnliveimg.com/main/cnlive/150819151803915_969.jpg");
+                        addItem.setUid(userID + "");
+
+                    } else {
+                        addItem.setContent(s);
+                        addItem.setPraise("0");
+                        addItem.setFacepath(user.getFaceurl());
+                        addItem.setUid(user.getUid() + "");
+
+                    }
+                    commentAdapter.addItem(addItem);
+
                 } else Toast.makeText(getActivity(), "评论失败", Toast.LENGTH_SHORT).show();
             }
         });
     }
+
+
 }
@@ -67,9 +67,9 @@ public class MessageContentInfo {
                                 messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": 送了" + messagecontent, message.getUserInfo().getHeadUrl(), true));
                             } 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));
+                                    messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " : ", message.getUserInfo().getHeadUrl(), false));
                                 } else {
-                                    messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), " :" + messagecontent, message.getUserInfo().getHeadUrl(), true));
+                                    messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), " : " + messagecontent, message.getUserInfo().getHeadUrl(), true));
                                 }
                                 if (onChatListener != null) {
                                     onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
@@ -85,7 +85,7 @@ public class MessageContentInfo {
                                 if (onChatListener != null) {
                                     onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), "来了", ""));
                                 }
-                                messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), ": " + "来了", message.getUserInfo().getHeadUrl(), true));
+                                messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), " : " + "来了", message.getUserInfo().getHeadUrl(), true));
                             }
                             if (onChatListener != null) {
                                 onChatListener.onchat(messageContentArrayList);
@@ -112,7 +112,7 @@ public class MessageContentInfo {
                     String messageType = cnMessageModle.getType();
                    if (messageType.equals(ChatRoom)) {
                         onChatListener.onbarrage(new BarrageBaseMessage(message.getUserInfo().getUserName(), messagecontent, ""));
-                        messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " :", message.getUserInfo().getHeadUrl(), false));
+                        messageContentArrayList.add(new MessageContent(message.getUserInfo().getUserName(), messagecontent + " : ", message.getUserInfo().getHeadUrl(), false));
                         onChatListener.onchat(messageContentArrayList);
                     }
                 } catch (Exception e) {
+package com.cnlive.gundam.video.utils;
+
+import android.view.Gravity;
+import android.widget.Toast;
+
+
+import com.cnlive.gundam.application.CNLiveApplication;
+
+
+
+
+public class ToastUtil {
+    private static long back_pressed;
+    private static String show_msg = "";
+
+    public static void showToast(String str, int duration) {
+        if (str.equals("")) return;
+        if (back_pressed + 2000 < System.currentTimeMillis() || !show_msg.equals(str)) {
+            show_msg = str;
+
+            Toast toast = Toast.makeText(CNLiveApplication.getContext(), str, duration);
+
+            toast.setGravity(Gravity.CENTER, 0, 0);
+            toast.show();
+        }
+        back_pressed = System.currentTimeMillis();
+    }
+
+
+    public static void showToast(String str) {
+        showToast(str, Toast.LENGTH_SHORT);
+    }
+}
+<?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"
+    android:useLevel="false">
+    <solid android:color="#454543" />
+    <size android:height="24dp" />
+    <corners
+        android:bottomLeftRadius="8dp"
+        android:bottomRightRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" /> <!-- 设置四个角的半径 -->
+
+</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">
+    <corners android:radius="10px" />
+    <solid android:color="#f7f7f7" />
+    <stroke
+        android:width="0.3dp"
+        android:color="#aaa" />
+    <size
+        android:width="29dp"
+        android:height="34dp" />
+
+</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="#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>
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#CC000000" />
-    <corners android:radius="9dp" />
+    <solid android:color="#555756" />
+
+
+    <corners android:radius="30dp" />
     <size
         android:height="18dp" />
     <stroke
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#FF4E51" />
-    <corners android:radius="9dp" />
+    <corners android:radius="30dp" />
     <size
         android:height="18dp" />
     <stroke
@@ -38,9 +38,11 @@
             android:id="@+id/edit_layout"
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:background="#555756"
+            android:orientation="horizontal"
             android:layout_alignParentBottom="true"
-            android:background="#e0000000"
-            android:orientation="horizontal">
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
             <ImageView
                 android:id="@+id/sendMessage"
@@ -83,6 +85,7 @@
             android:visibility="invisible">
             <android.support.v7.widget.RecyclerView
+                android:padding="5dp"
                 android:id="@+id/recycler_gift"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -10,6 +10,7 @@
     </data>
     <RelativeLayout
+        android:background="@drawable/record_end"
         android:id="@+id/ll_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -21,7 +21,7 @@
         <RelativeLayout
             android:id="@+id/contentLayout"
-            android:background="@android:color/black"
+            android:background="#282828"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@+id/videoView">
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<RelativeLayout
+    android:id="@+id/ll_vod_detail"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.cnlive.gundam.main.ui.widget.SwipeRecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/srv_vod_detail" />
+    <LinearLayout
+        android:visibility="gone"
+        android:background="@color/white"
+        android:id="@+id/ll_comment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp">
+
+            <TextView
+                android:id="@+id/comment_title_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="12dp"
+                android:text="评论"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/comment_title_tv_nums"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/comment_title_tv"
+                android:layout_toRightOf="@id/comment_title_tv"
+                android:textSize="10sp"
+                />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color_cutline_ececec" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="63dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="15dp">
+
+            <ImageView
+                android:id="@+id/comment_title_img_head"
+                android:layout_width="29dp"
+                android:layout_height="29dp"
+                android:layout_marginRight="16dp"
+                />
+
+            <RelativeLayout
+
+                android:id="@+id/comment_title_layout_comment"
+                android:layout_width="290dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/circle_corner_gray"
+                android:orientation="horizontal"
+                android:paddingRight="10dp">
+
+                <TextView
+                    android:id="@+id/comment_title_tv_textlimit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
+                    android:textColor="@color/color_text_normal_999"
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:id="@+id/comment_title_et"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toLeftOf="@id/comment_title_tv_textlimit"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="我要评论~"
+                    android:includeFontPadding="false"
+                    android:paddingLeft="15dp"
+                    android:textColor="#a1a1a1"
+                    android:textSize="13sp" />
+
+            </RelativeLayout>
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</RelativeLayout>
+</layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <!--数据-->
+        <variable
+            name="data"
+            type="java.lang.Class"/>
+        <!--事件处理，例如点击事件-->
+        <variable
+            name="itemP"
+            type="java.lang.Class"/>
+    </data>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</layout>
+
+<?xml version="1.0" encoding="utf-8"?><!--评论回复 item布局-->
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="data"
+            type="com.cnlive.gundam.main.model.CommentViewModel"></variable>
+        <variable
+            name="itemP"
+            type="com.cnlive.gundam.video.fragment.CommentDetailsFragment.OnBindItemClick"/>
+    </data>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="18dp"
+    android:paddingTop="10dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingBottom="5dp"
+        android:paddingTop="5dp">
+
+        <ImageView
+            android:id="@+id/comment_item_img"
+            android:layout_width="29dp"
+            android:layout_height="29dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="10dp"
+            app:circleUrl="@{data.userHead}"
+            tools:src="@drawable/icon_default_portrait_87" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/comment_item_img"
+            android:layout_alignTop="@id/comment_item_img"
+            android:layout_toRightOf="@id/comment_item_img"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/comment_item_tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#666"
+                android:textSize="11sp"
+                android:text="@{data.id}" />
+
+            <TextView
+                android:id="@+id/comment_item_tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#b6b6b6"
+                android:textSize="8sp"
+                android:text="@{data.time}"
+                tools:text="2017-3-5 15:46" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:clickable="@{data.isClickAble}"
+
+
+            android:onClick="@{v->itemP.onPraiseClick(data)}"
+            android:id="@+id/comment_item_layout_praise"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/comment_item_img"
+            android:layout_alignTop="@id/comment_item_img"
+            android:layout_marginRight="9dp"
+            android:layout_alignParentRight="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/comment_item_img_praise"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="3dp"
+                app:backgroundUrl="@{data.praiseImage}"
+                android:src="@drawable/vod_detail_good"/>
+
+            <TextView
+                android:id="@+id/comment_item_tv_praisenum"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#c2c9cc"
+                android:textSize="9sp"
+                android:text="@{data.praise}"
+                tools:text="124" />
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/comment_item_tv_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="14dp"
+        android:layout_marginLeft="54dp"
+        android:gravity="left"
+        android:textColor="#333333"
+        android:textSize="13sp"
+        android:text="@{data.commentContent}"
+        tools:text="明月几时有，把酒问青天。不知天上宫阙，今夕是何年？我欲乘风鬼区，又恐琼楼玉宇，高处不胜寒。" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/color_9d9d9d"/>
+</LinearLayout>
+</layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  >
+    <data>
+        <variable
+            name="data"
+            type="com.cnlive.gundam.main.model.CommentTitleViewModel"></variable>
+        <variable
+            name="itemP"
+            type="com.cnlive.gundam.video.fragment.CommentDetailsFragment.OnBindItemClick"/>
+    </data>
+<LinearLayout
+    android:background="@color/white"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp">
+
+        <TextView
+            android:id="@+id/comment_title_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="12dp"
+            android:text="评论"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/comment_title_tv_nums"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/comment_title_tv"
+            android:layout_toRightOf="@id/comment_title_tv"
+            android:textSize="10sp"
+            android:text="@{data.count}" />
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/color_cutline_ececec" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="63dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="15dp">
+
+        <ImageView
+            android:id="@+id/comment_title_img_head"
+            android:layout_width="29dp"
+            android:layout_height="29dp"
+            android:layout_marginRight="16dp"
+             />
+
+        <RelativeLayout
+            android:onClick="@{v->itemP.onCommentClick()}"
+            android:id="@+id/comment_title_layout_comment"
+            android:layout_width="290dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/circle_corner_gray"
+            android:orientation="horizontal"
+            android:paddingRight="10dp">
+
+            <TextView
+                android:id="@+id/comment_title_tv_textlimit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_vertical"
+                android:textColor="@color/color_text_normal_999"
+                android:textSize="11sp" />
+
+            <TextView
+                android:id="@+id/comment_title_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/comment_title_tv_textlimit"
+                android:background="@null"
+                android:gravity="center_vertical"
+                android:hint="我要评论~"
+                android:includeFontPadding="false"
+                android:paddingLeft="15dp"
+                android:textColor="#a1a1a1"
+                android:textSize="13sp" />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
+</layout>
 \ No newline at end of file
@@ -11,64 +11,99 @@
     </data>
     <RelativeLayout
+
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:padding="10dp">
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/left_lin"
-
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:orientation="horizontal">
+            android:layout_alignParentLeft="true"
+            android:background="@drawable/chat_gift_bg"
-            <com.cnlive.gundam.user.view.CircleImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                app:imageUrl="@{user.icon}"/>
+            android:paddingBottom="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="5dp">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@android:color/white"
-                android:text="@{user.name}" />
+            <ImageView
-            <TextView
+                android:id="@+id/iv_left_user_icon"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                app:imageUrl="@{user.icon}" />
+
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/white"
-                android:text="@{user.messaage}" />
-        </LinearLayout>
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/iv_left_user_icon"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_left_user_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text='@{user.name}'
+                    android:textColor="@android:color/white" />
+
+                <TextView
+                    android:id="@+id/tv_left_user_mewssage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text='@{user.messaage}'
+                    android:textColor="@android:color/white" />
+            </LinearLayout>
+
+
+        </RelativeLayout>
         <LinearLayout
             android:id="@+id/right_lin"
+            android:background="@drawable/chat_gift_bg"
+            android:paddingBottom="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="5dp"
             android:layout_alignParentRight="true"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
             android:orientation="horizontal">
             <TextView
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="10dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@android:color/white"
                 android:text="@{user.messaage}" />
             <TextView
+                android:layout_gravity="center_vertical"
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@android:color/white"
                 android:text="@{user.name}" />
-            <com.cnlive.gundam.user.view.CircleImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+            <ImageView
+                android:layout_gravity="center_vertical"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
                 app:imageUrl="@{user.icon}"
                 />
         </LinearLayout>
+
+
     </RelativeLayout>
 </layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewTabView"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:gravity="center"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/ivIcon"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:scaleType="centerInside"
+        android:src="@mipmap/ic_launcher_round" />
+
+    <TextView
+        android:id="@+id/tvTitle"
+        android:layout_weight="2"
+        android:gravity="center"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="首页"/>
+
+</LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/footer_view"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    android:gravity="center"
+    >
+    <ProgressBar
+        android:id="@+id/footer_view_progressbar"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        />
+
+    <TextView
+        android:id="@+id/footer_view_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="正在加载，请稍后..."
+
+        />
+</LinearLayout>
 \ No newline at end of file
+<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
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout
+    android:id="@+id/SwipeRefreshLayout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/RecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:cacheColorHint="@null"
+        android:scrollbars="none"/>
+
+</android.support.v4.widget.SwipeRefreshLayout>
 \ No newline at end of file
@@ -25,4 +25,10 @@
     <color name="record_title_bg_default">#919191</color>
     <color name="record_title_bg_selected">#616060</color>
     <color name="ffcc00">#ffcc00</color>
+    <color name="white">#ffffff</color>
+    <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>
@@ -40,6 +40,8 @@
     <string name="ugc_live">直播</string>
     <string name="ugc_vod">回放</string>
+    <string name="user_token_invalid">用户的token失效，请重新登录</string>
+
     <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
     <string name="debug_verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s&amp;type=0 </string>