消息页面修改

吴奎庆
1 parent a0d1f226
Showing 6 changed files with 309 additions and 60 deletions
app/src/main/java/com/cnlive/goldenline/ui/activity/MyMessageActivity.java
app/src/main/java/com/cnlive/goldenline/ui/adapter/MyMessageAdapter.java
app/src/main/java/com/cnlive/goldenline/util/RestAdapterUtils.java
app/src/main/java/com/cnlive/goldenline/viewmodel/MyMessageModleView.java
app/src/main/res/layout/activity_my_message.xml
app/src/main/res/layout/layout_msg_item_2.xml
@@ -2,6 +2,7 @@ package com.cnlive.goldenline.ui.activity;
 import android.content.Context;
 import android.content.Intent;
+import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.DefaultItemAnimator;
@@ -14,6 +15,7 @@ import android.widget.TextView;
 import com.cnlive.goldenline.R;
 import com.cnlive.goldenline.api.CmsAPI;
+import com.cnlive.goldenline.databinding.ActivityMyMessageBinding;
 import com.cnlive.goldenline.model.AnchorItem;
 import com.cnlive.goldenline.model.User;
 import com.cnlive.goldenline.model.request.MessageBean;
@@ -21,6 +23,7 @@ import com.cnlive.goldenline.model.request.UserMessageBean;
 import com.cnlive.goldenline.model.response.ListResponse;
 import com.cnlive.goldenline.ui.activity.act.ActActivity;
 import com.cnlive.goldenline.ui.activity.act.model.ActWebActivity;
+import com.cnlive.goldenline.ui.adapter.MyMessageAdapter;
 import com.cnlive.goldenline.ui.adapter.MyMsgAdapter;
 import com.cnlive.goldenline.ui.base.BaseActivity;
 import com.cnlive.goldenline.ui.interfaces.RecyclerViewItemClickListener;
@@ -29,6 +32,7 @@ import com.cnlive.goldenline.ui.widget.pull2refresh.PullToRefreshLayout;
 import com.cnlive.goldenline.util.RestAdapterUtils;
 import com.cnlive.goldenline.util.ToastUtil;
 import com.cnlive.goldenline.util.UserService;
+import com.cnlive.goldenline.viewmodel.MyMessageModleView;
 import com.cnlive.libs.util.data.okhttpUtil.utils.L;
 import com.google.gson.Gson;
@@ -66,7 +70,7 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
     private List<MessageBean> dataList = new ArrayList<>();
-    private List<MessageBean> addList = new ArrayList<>();
+
     private MyMsgAdapter adapter;
@@ -85,6 +89,8 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my_message);
+
+
         ButterKnife.bind(this);
         cmsAPI = RestAdapterUtils.getRestAPI(CmsAPI.class);
         getUserInfo();
@@ -115,27 +121,38 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
                             List<MessageBean> data = userMessageBean.getRecordList();
-                            if (data.size() != 0) {
-
-                                dataList.addAll(data);
-                                initData();
-                            }
                             if (userMessageBean.getErrMsg().equals("success")) {
                                 if (state.equals("init")) {
                                     pull_to_refresh.refreshFinish(PullToRefreshLayout.SUCCEED);
+                                    if (data.size() != 0) {
+
+                                        dataList.addAll(data);
+                                        initData();
+
+                                    }
-                                }else if (state.equals("load")){
+                                } else if (state.equals("load")) {
                                     pull_to_refresh.loadmoreFinish(PullToRefreshLayout.SUCCEED);
+                                    if (data.size() != 0) {
-                                }else{
+                                        dataList.addAll(data);
+                                        myMessageAdapter.notifyDataSetChanged();
+
+                                    }
+
+                                } else {
                                     pull_to_refresh.refreshFinish(PullToRefreshLayout.SUCCEED);
+                                    if (data.size() != 0) {
-                                }
+                                        dataList.addAll(data);
+                                        initData();
+                                    }
+                                }
                                 if (dataList.size() == 0) {
@@ -145,7 +162,7 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
                                 }
-                            } else if (userMessageBean.getCode()==4) {
+                            } else if (userMessageBean.getCode() == 4) {
                                 ToastUtil.showToast(userMessageBean.getErrMsg());
                                 pull_to_refresh.refreshFinish(PullToRefreshLayout.SUCCEED);
@@ -182,6 +199,7 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
     /**
      * 初始化数据
      */
+    MyMessageAdapter myMessageAdapter;
     private void initData() {
@@ -190,15 +208,17 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
         pull_to_refresh.setPullUpEnable(true);
         pull_to_refresh.setPullDownEnable(true);
         button_back.setOnClickListener(this);
-        adapter = new MyMsgAdapter(this );
+//        adapter = new MyMsgAdapter(this);
+
+         myMessageAdapter=  new MyMessageAdapter(dataList);
         recycle_msg.setLayoutManager(new LinearLayoutManager(this));
         recycle_msg.setItemAnimator(new DefaultItemAnimator());
         recycle_msg.setHasFixedSize(true);
-        adapter.addItems(dataList);
+//        adapter.addItems(dataList);
-        recycle_msg.setAdapter(adapter);
+        recycle_msg.setAdapter(myMessageAdapter);
     }
@@ -223,7 +243,7 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
         dataList.clear();
         getData(1, "refresh");
-        page=1;
+        page = 1;
         initData();
@@ -245,6 +265,5 @@ public class MyMessageActivity extends BaseActivity implements PullToRefreshLayo
     public void onItemClick(View view, MessageBean messageBean, int position, int eventType) {
-
     }
 }
+package com.cnlive.goldenline.ui.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.cnlive.goldenline.R;
+import com.cnlive.goldenline.databinding.LayoutMsgItem2Binding;
+import com.cnlive.goldenline.model.request.MessageBean;
+import com.cnlive.goldenline.viewmodel.MyMessageModleView;
+
+import java.util.List;
+
+import static android.databinding.DataBindingUtil.inflate;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/5/15
+ * <p>
+ * 描述：
+ */
+
+public class MyMessageAdapter extends RecyclerView.Adapter<MyMessageAdapter.BindingHolder> {
+    List<MessageBean> dataList;
+
+    public MyMessageAdapter(List<MessageBean> dataList) {
+        this.dataList=dataList;
+    }
+
+    @Override
+    public MyMessageAdapter.BindingHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        LayoutMsgItem2Binding item2Binding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.layout_msg_item_2, parent, false);
+        return new BindingHolder(item2Binding);
+    }
+
+    @Override
+    public void onBindViewHolder(MyMessageAdapter.BindingHolder holder, int position) {
+        MyMessageModleView myMessageModleView= new MyMessageModleView(dataList.get(position));
+
+        holder.item2Binding.setMsgModleView(myMessageModleView);
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+
+
+    public class BindingHolder extends RecyclerView.ViewHolder {
+        LayoutMsgItem2Binding item2Binding;
+
+        public BindingHolder(LayoutMsgItem2Binding item2Binding) {
+            super(item2Binding.llItem);
+
+            this.item2Binding = item2Binding;
+        }
+    }
+}
@@ -137,7 +137,7 @@ public class RestAdapterUtils {
         client.setReadTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
         RestAdapter restAdapter = new RestAdapter.Builder()
                 .setLogLevel(level)
-                .setEndpoint(Configs.TEST_PAYCOULD)
+                .setEndpoint(Configs.URL_TEST)
                 .setClient(new OkClient(client))
                 .build();
+package com.cnlive.goldenline.viewmodel;
+
+import android.app.Activity;
+import android.databinding.BaseObservable;
+import android.databinding.BindingAdapter;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.cnlive.goldenline.R;
+import com.cnlive.goldenline.databinding.ActivityMyMessageBinding;
+import com.cnlive.goldenline.model.request.MessageBean;
+import com.cnlive.goldenline.ui.adapter.MyMsgAdapter;
+import com.cnlive.goldenline.ui.widget.CropCircleTransformation;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2017/5/11
+ * <p>
+ * 描述：
+ */
+
+public class MyMessageModleView extends BaseObservable{
+    MessageBean data;
+
+    public MyMessageModleView(MessageBean data) {
+        this.data = data;
+
+    }
+
+
+    public String getTitle() {
+
+        return data.getMessageSubTitle();
+    }
+
+
+    public String getContent() {
+
+        return data.getMessageContent();
+    }
+
+
+
+
+    public String getTime() {
+
+        return data.getMessageTime();
+    }
+
+
+    public String getImageUrl() {
+        return data.getMessageUrlImg();
+    }
+
+
+    @BindingAdapter({"app:imageUrl"})
+    public static void loadInternetImage(ImageView imageView, String url) {
+        Glide.with(imageView.getContext())
+                .load(url)
+                .placeholder(R.mipmap.login_no)
+                .error(R.mipmap.login_no)
+                .bitmapTransform(new CropCircleTransformation(imageView.getContext()))
+                .into(imageView);
+
+
+
+    }
+
+
+}
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <RelativeLayout
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="myMessageModleView"
+            type="com.cnlive.goldenline.viewmodel.MyMessageModleView" />
+
+
+    </data>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@color/colorPrimaryDark">
-
-        <ImageButton
-            android:id="@+id/button_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="4dp"
-            android:background="@mipmap/button_back_white_arror"
-            android:scaleType="fitXY" />
-
-        <TextView
-            android:id="@+id/text_middle_title"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:text="我的消息"
-            android:textColor="@color/white"
-            android:textSize="17sp" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+            android:layout_height="45dp"
+            android:background="@color/colorPrimaryDark">
-        <com.cnlive.goldenline.ui.widget.pull2refresh.PullToRefreshLayout
-            android:id="@+id/pull_to_refresh"
+            <ImageButton
+                android:id="@+id/button_back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="4dp"
+                android:background="@mipmap/button_back_white_arror"
+                android:scaleType="fitXY" />
+
+            <TextView
+                android:id="@+id/text_middle_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="我的消息"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <com.cnlive.goldenline.ui.widget.pull2refresh.PullableRecyclerView
-                android:id="@+id/recycle_msg"
+            <com.cnlive.goldenline.ui.widget.pull2refresh.PullToRefreshLayout
+                android:id="@+id/pull_to_refresh"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </com.cnlive.goldenline.ui.widget.pull2refresh.PullToRefreshLayout>
+                android:layout_height="match_parent">
-        <TextView
-            android:visibility="gone"
-            android:id="@+id/errorText"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/my_message_null" />
+                <com.cnlive.goldenline.ui.widget.pull2refresh.PullableRecyclerView
+                    android:id="@+id/recycle_msg"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+            </com.cnlive.goldenline.ui.widget.pull2refresh.PullToRefreshLayout>
+
+            <TextView
+                android:id="@+id/errorText"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/my_message_null"
+                android:visibility="gone" />
-    </RelativeLayout>
+        </RelativeLayout>
-</LinearLayout>
+    </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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="msgModleView"
+            type="com.cnlive.goldenline.viewmodel.MyMessageModleView"/>
+
+    </data>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:id="@+id/ll_item"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="61dp">
+
+        <ImageView
+            android:id="@+id/ima_msg_head"
+            android:layout_width="46dp"
+            android:layout_height="46dp"
+            android:layout_marginLeft="15dp"
+            android:src="@mipmap/login_no"
+            app:imageUrl="@{msgModleView.imageUrl}"
+
+            android:layout_alignBottom="@+id/tv_msg_content"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="15dp" />
+
+        <TextView
+            android:id="@+id/tv_msg_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="3dp"
+            android:layout_marginTop="10dp"
+            android:layout_toLeftOf="@+id/tv_msg_date"
+            android:layout_toRightOf="@id/ima_msg_head"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@{msgModleView.title}"
+            android:textColor="@color/color_010101"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_msg_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_msg_title"
+            android:layout_marginLeft="12dp"
+            android:layout_marginTop="6dp"
+            android:layout_toLeftOf="@+id/tv_msg_date"
+            android:layout_toRightOf="@id/ima_msg_head"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@{msgModleView.content}"
+            android:textColor="@color/color_a5a5a5"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/tv_msg_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="15dp"
+            android:text="@{msgModleView.time}"
+            android:textColor="@color/color_a5a5a5"
+            android:textSize="11sp" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="73dp"
+        android:background="@color/color_ededed" />
+</LinearLayout>
+</layout>
 \ No newline at end of file