修改message页面前保存

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/SortSubsrciprion.java

@@ -0,0 +1,13 @@
+package com.xzjmyk.pm.activity.bean.message;
+
+import java.util.ArrayList;
+
+/**
+ * Created by gongpm on 2016/6/14.
+ */
+public class SortSubsrciprion   {
+    public int num_id;
+    public ArrayList<SubscriptionMessage> beans;
+
+
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/SubscriptionMessage.java

@@ -1,171 +1,89 @@
 package com.xzjmyk.pm.activity.bean.message;
 
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-
 /**
  * Created by gongpm on 2016/6/3.
  */
-public class SubscriptionMessage implements Parcelable {
-    private int id_;
-    private int num_id;        //订阅id
-    private int instance_id;   //实例id
-    private String createdate_; //创建时间
-    private String data_;      //数据
-    private String title_;
-    private String son_title_;  //合计标题
-    private int status;      //阅读状态
-
-    private ArrayList<SubscriptionBean> beans;
-
-    public SubscriptionMessage() {
-    }
-
-    protected SubscriptionMessage(Parcel in) {
-        id_ = in.readInt();
-        num_id = in.readInt();
-        instance_id = in.readInt();
-        createdate_ = in.readString();
-        data_ = in.readString();
-        title_ = in.readString();
-        son_title_ = in.readString();
-        status = in.readInt();
-    }
-
-    public static final Creator<SubscriptionMessage> CREATOR = new Creator<SubscriptionMessage>() {
-        @Override
-        public SubscriptionMessage createFromParcel(Parcel in) {
-            return new SubscriptionMessage(in);
-        }
-
-        @Override
-        public SubscriptionMessage[] newArray(int size) {
-            return new SubscriptionMessage[size];
-        }
-    };
-
-    public int getId_() {
-        return id_;
-    }
+public class SubscriptionMessage {
 
-    public void setId_(int id_) {
-        this.id_ = id_;
-    }
-
-    public int getNum_id() {
-        return num_id;
-    }
+    private int ID_;
+    private int NUM_ID_;        //订阅id
+    private int INSTANCE_ID_;   //实例id
+    private String CREATEDATE_; //创建时间
+    private String TITLE_;
+    private String SON_TITLE_;  //合计标题
+    private int STATUS_;      //阅读状态
+    private int EMP_ID_;
+    private int RN;
 
-    public void setNum_id(int num_id) {
-        this.num_id = num_id;
+    public int getID_() {
+        return ID_;
     }
 
-    public int getInstance_id() {
-        return instance_id;
+    public void setID_(int ID_) {
+        this.ID_ = ID_;
     }
 
-    public void setInstance_id(int instance_id) {
-        this.instance_id = instance_id;
+    public int getNUM_ID_() {
+        return NUM_ID_;
     }
 
-    public String getCreatedate_() {
-        return createdate_;
+    public void setNUM_ID_(int NUM_ID_) {
+        this.NUM_ID_ = NUM_ID_;
     }
 
-    public void setCreatedate_(String createdate_) {
-        this.createdate_ = createdate_;
+    public int getINSTANCE_ID_() {
+        return INSTANCE_ID_;
     }
 
-    public String getData_() {
-        return data_;
+    public void setINSTANCE_ID_(int INSTANCE_ID_) {
+        this.INSTANCE_ID_ = INSTANCE_ID_;
     }
 
-    public void setData_(String data_) {
-        this.data_ = data_;
+    public String getCREATEDATE_() {
+        return CREATEDATE_;
     }
 
-    public String getTitle_() {
-        return title_;
+    public void setCREATEDATE_(String CREATEDATE_) {
+        this.CREATEDATE_ = CREATEDATE_;
     }
 
-    public void setTitle_(String title_) {
-        this.title_ = title_;
+    public String getTITLE_() {
+        return TITLE_;
     }
 
-    public String getSon_title_() {
-        return son_title_;
+    public void setTITLE_(String TITLE_) {
+        this.TITLE_ = TITLE_;
     }
 
-    public void setSon_title_(String son_title_) {
-        this.son_title_ = son_title_;
+    public String getSON_TITLE_() {
+        return SON_TITLE_;
     }
 
-    public int getStatus() {
-        return status;
+    public void setSON_TITLE_(String SON_TITLE_) {
+        this.SON_TITLE_ = SON_TITLE_;
     }
 
-    public void setStatus(int status) {
-        this.status = status;
+    public int getSTATUS_() {
+        return STATUS_;
     }
 
-    public ArrayList<SubscriptionBean> getBeans() {
-        return beans;
+    public void setSTATUS_(int STATUS_) {
+        this.STATUS_ = STATUS_;
     }
 
-    public void setBeans(ArrayList<SubscriptionBean> beans) {
-        this.beans = beans;
+    public int getEMP_ID_() {
+        return EMP_ID_;
     }
 
-    public SubscriptionBean getNewBean() {
-        return new SubscriptionBean();
+    public void setEMP_ID_(int EMP_ID_) {
+        this.EMP_ID_ = EMP_ID_;
     }
 
-    @Override
-    public int describeContents() {
-        return 0;
+    public int getRN() {
+        return RN;
     }
 
-    @Override
-    public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(id_);
-        parcel.writeInt(num_id);
-        parcel.writeInt(instance_id);
-        parcel.writeString(createdate_);
-        parcel.writeString(data_);
-        parcel.writeString(title_);
-        parcel.writeString(son_title_);
-        parcel.writeInt(status);
-    }
-
-    public class SubscriptionBean {
-        private int id;
-        private String imageUrl;
-        private String subTitle;
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-
-        public String getImageUrl() {
-            return imageUrl;
-        }
-
-        public void setImageUrl(String imageUrl) {
-            this.imageUrl = imageUrl;
-        }
-
-        public String getSubTitle() {
-            return subTitle;
-        }
-
-        public void setSubTitle(String subTitle) {
-            this.subTitle = subTitle;
-        }
+    public void setRN(int RN) {
+        this.RN = RN;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/OtherSqliteHelper.java

@@ -12,7 +12,6 @@ public class OtherSqliteHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "other.db";
     private static final int DATABASE_VERSION = 1;
 
-
     public OtherSqliteHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
@@ -20,7 +19,7 @@ public class OtherSqliteHelper extends SQLiteOpenHelper {
     @Override
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
         String sql = "CREATE TABLE SubscriptionMessage(id_ PRIMARY KEY,num_id,instance_id ,createdate_,data_," +
-                "title_,son_title_,status)";
+                "title_,son_title_,status,EMP_ID_,RN)";
         sqLiteDatabase.execSQL(sql);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SubscriptionDao.java

@@ -1,131 +1,132 @@
-package com.xzjmyk.pm.activity.db.dao;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
-
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
-import com.xzjmyk.pm.activity.db.OtherSqliteHelper;
-
-import java.util.ArrayList;
-
-/**
- * Created by gongpm on 2016/6/7.
- */
-public class SubscriptionDao {
-    private static SubscriptionDao instance = null;
-    private OtherSqliteHelper sqliteHelper;
-    private String titleName = "SubscriptionMessage";
-
-    private SubscriptionDao() {
-        sqliteHelper = new OtherSqliteHelper(MyApplication.getInstance());
-    }
-
-    public static SubscriptionDao getInstance() {
-        if (instance == null) {
-            synchronized (SubscriptionDao.class) {
-                instance = new SubscriptionDao();
-            }
-        }
-        return instance;
-    }
-
-    //添加多个数据
-    public long addMessage(ArrayList<SubscriptionMessage> messages) {
-        long k = 0;
-        SQLiteDatabase db = sqliteHelper.getWritableDatabase();
-        db.beginTransaction();
-        try {
-            ContentValues values;
-            String nullColumn = null;
-            SubscriptionMessage message = null;
-            for (int i = 0; i < messages.size(); i++) {
-                message = messages.get(i);
-                values = new ContentValues();
-                values.put("id_", message.getId_());
-                values.put("num_id", message.getNum_id());
-                values.put("instance_id", message.getInstance_id());
-                values.put("createdate_", message.getCreatedate_());
-                values.put("data_", message.getData_());
-                values.put("title_", message.getTitle_());
-                values.put("son_title_", message.getSon_title_());
-                values.put("status", message.getStatus());
-                k += db.insert(titleName, nullColumn, values);
-            }
-            db.setTransactionSuccessful();
-            return k;
-        } catch (android.database.SQLException e) {
-            e.printStackTrace();
-        } finally {
-            db.endTransaction();
-            db.close();
-        }
-        return 0;
-    }
-
-    //添加单个数据
-    public long addMessage(SubscriptionMessage message) {
-        long k = 0;
-        SQLiteDatabase db = sqliteHelper.getWritableDatabase();
-        db.beginTransaction();
-        try {
-            ContentValues values;
-            String nullColumn = null;
-            values = new ContentValues();
-            values.put("id_", message.getId_());
-            values.put("num_id", message.getNum_id());
-            values.put("instance_id", message.getInstance_id());
-            values.put("createdate_", message.getCreatedate_());
-            values.put("data_", message.getData_());
-            values.put("title_", message.getTitle_());
-            values.put("son_title_", message.getSon_title_());
-            values.put("status", message.getStatus());
-            k += db.insert(titleName, nullColumn, values);
-            db.setTransactionSuccessful();
-
-        } catch (SQLException e) {
-            Log.i("gong", e.getMessage());
-            e.printStackTrace();
-        } finally {
-            db.endTransaction();
-            db.close();
-        }
-        return k;
-    }
-
-    public ArrayList<SubscriptionMessage> findAll() {
-        ArrayList<SubscriptionMessage> messages = new ArrayList<>();
-        SQLiteDatabase db = sqliteHelper.getReadableDatabase();
-        String[] colums = {"id_", "num_id", "instance_id", "createdate_", "data_", "title_", "son_title_", "status"};
-        String selection = null;
-        String[] selectionArgs = null;
-        try {
-            SubscriptionMessage message = null;
-            Cursor values = db.query(titleName, colums, selection, selectionArgs, null, null, null);
-            Log.i("gong", "读取完成values=" + values.moveToNext());
-            while (values.moveToNext()) {
-                message = new SubscriptionMessage();
-                message.setId_(values.getInt(0));
-                message.setNum_id(values.getInt(1));
-                message.setInstance_id(values.getInt(2));
-                message.setCreatedate_(values.getString(3));
-                message.setData_(values.getString(4));
-                message.setTitle_(values.getString(5));
-                message.setSon_title_(values.getString(6));
-                message.setStatus(values.getInt(7));
-                messages.add(message);
-                Log.i("gong", "获取到一个");
-
-            }
-            return messages;
-        } catch (SQLException e) {
-            Log.i("gong", e.getMessage());
-        } finally {
-            db.close();
-        }
-        return null;
-    }
-}
+//package com.xzjmyk.pm.activity.db.dao;
+//
+//import android.content.ContentValues;
+//import android.database.Cursor;
+//import android.database.SQLException;
+//import android.database.sqlite.SQLiteDatabase;
+//import android.util.Log;
+//
+//import com.xzjmyk.pm.activity.MyApplication;
+//import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
+//import com.xzjmyk.pm.activity.db.OtherSqliteHelper;
+//
+//import java.util.ArrayList;
+//
+///**
+// * Created by gongpm on 2016/6/7.
+// */
+//public class SubscriptionDao {
+//    private static SubscriptionDao instance = null;
+//    private OtherSqliteHelper sqliteHelper;
+//    private String titleName = "SubscriptionMessage";
+//
+//    private SubscriptionDao() {
+//        sqliteHelper = new OtherSqliteHelper(MyApplication.getInstance());
+//    }
+//
+//    public static SubscriptionDao getInstance() {
+//        if (instance == null) {
+//            synchronized (SubscriptionDao.class) {
+//                instance = new SubscriptionDao();
+//            }
+//        }
+//        return instance;
+//    }
+//
+//    //添加多个数据
+//    public long addMessage(ArrayList<SubscriptionMessage> messages) {
+//        long k = 0;
+//        SQLiteDatabase db = sqliteHelper.getWritableDatabase();
+//        db.beginTransaction();
+//        try {
+//            ContentValues values;
+//            String nullColumn = null;
+//            SubscriptionMessage message = null;
+//            for (int i = 0; i < messages.size(); i++) {
+//                message = messages.get(i);
+//                values = new ContentValues();
+//                values.put("id_", message.getId_());
+//                values.put("num_id", message.getNum_id());
+//                values.put("instance_id", message.getInstance_id());
+//                values.put("createdate_", message.getCreatedate_());
+//                values.put("title_", message.getTitle_());
+//                values.put("son_title_", message.getSon_title_());
+//                values.put("status", message.getStatus());
+//                values.put("EMP_ID_", message.getStatus());
+//                values.put("RN", message.getStatus());
+//                k += db.insert(titleName, nullColumn, values);
+//            }
+//            db.setTransactionSuccessful();
+//            return k;
+//        } catch (android.database.SQLException e) {
+//            e.printStackTrace();
+//        } finally {
+//            db.endTransaction();
+//            db.close();
+//        }
+//        return 0;
+//    }
+//
+//    //添加单个数据
+//    public long addMessage(SubscriptionMessage message) {
+//        long k = 0;
+//        SQLiteDatabase db = sqliteHelper.getWritableDatabase();
+//        db.beginTransaction();
+//        try {
+//            ContentValues values;
+//            String nullColumn = null;
+//            values = new ContentValues();
+//            values.put("id_", message.getId_());
+//            values.put("num_id", message.getNum_id());
+//            values.put("instance_id", message.getInstance_id());
+//            values.put("createdate_", message.getCreatedate_());
+//            values.put("title_", message.getTitle_());
+//            values.put("son_title_", message.getSon_title_());
+//            values.put("status", message.getStatus());
+//            values.put("EMP_ID_", message.getStatus());
+//            values.put("RN", message.getStatus());
+//            k += db.insert(titleName, nullColumn, values);
+//            db.setTransactionSuccessful();
+//
+//        } catch (SQLException e) {
+//            Log.i("gong", e.getMessage());
+//            e.printStackTrace();
+//        } finally {
+//            db.endTransaction();
+//            db.close();
+//        }
+//        return k;
+//    }
+//
+//    public ArrayList<SubscriptionMessage> findAll() {
+//        ArrayList<SubscriptionMessage> messages = new ArrayList<>();
+//        SQLiteDatabase db = sqliteHelper.getReadableDatabase();
+//        String[] colums = {"id_", "num_id", "instance_id", "createdate_", "data_", "title_", "son_title_", "status"};
+//        String selection = null;
+//        String[] selectionArgs = null;
+//        try {
+//            SubscriptionMessage message = null;
+//            Cursor values = db.query(titleName, colums, selection, selectionArgs, null, null, null);
+//            Log.i("gong", "读取完成values=" + values.moveToNext());
+//            while (values.moveToNext()) {
+//                message = new SubscriptionMessage();
+//                message.setId_(values.getInt(0));
+//                message.setNum_id(values.getInt(1));
+//                message.setInstance_id(values.getInt(2));
+//                message.setCreatedate_(values.getString(3));
+//                message.setTitle_(values.getString(5));
+//                message.setSon_title_(values.getString(6));
+//                message.setStatus(values.getInt(7));
+//                messages.add(message);
+//                Log.i("gong", "获取到一个");
+//
+//            }
+//            return messages;
+//        } catch (SQLException e) {
+//            Log.i("gong", e.getMessage());
+//        } finally {
+//            db.close();
+//        }
+//        return null;
+//    }
+//}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -20,7 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.message.SubscribeListActivity;
+import com.xzjmyk.pm.activity.ui.message.SubscriptionActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -113,8 +113,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 startActivity(intent);
                 break;
             case R.id.my_data_rl:
-//                startActivity(new Intent(getActivity(), SubscriptionActivity.class));
-                startActivity(new Intent(getActivity(), SubscribeListActivity.class));
+                startActivity(new Intent(getActivity(), SubscriptionActivity.class));
                 ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
                 break;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -186,7 +186,8 @@ public class MessageFragment extends EasyFragment {
                                 || mode.getBean().getShowName().startsWith(filter)) {
                             mFriendList.add(mode);
                         }
-
+                        if (i == (mOriginalFriendList.size() - 1)) {
+                        }
                     }
                 }
                 mAdapter.notifyDataSetChanged();
@@ -283,8 +284,6 @@ public class MessageFragment extends EasyFragment {
         isRefeshed = true;
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", MyApplication.getInstance().mAccessToken);
-        Log.i("Arison", "MessageFragment:upDataFriend:279:" + MyApplication.getInstance().mAccessToken);
-        Log.i("Arison", "MessageFragment:upDataFriend:280:" + MyApplication.getInstance().getConfig().FRIENDS_ATTENTION_LIST);
         StringJsonArrayRequest<AttentionUser> request = new StringJsonArrayRequest<AttentionUser>(
                 MyApplication.getInstance().getConfig().FRIENDS_ATTENTION_LIST, new ErrorListener() {
             @Override
@@ -295,7 +294,6 @@ public class MessageFragment extends EasyFragment {
             @Override
             public void onResponse(ArrayResult<AttentionUser> result) {
                 boolean success = Result.defaultParser(mActivity, result, false);
-                Log.i("MessageFragment", "更新好友列表数据：" + JSON.toJSONString(result));
                 if (success) {
                     FriendDao.getInstance().addAttentionUsers(mHandler, MyApplication.getInstance().mLoginUser.getUserId(), result.getData(),
                             new OnCompleteListener() {
@@ -341,7 +339,6 @@ public class MessageFragment extends EasyFragment {
                 String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
                 long startTime = System.currentTimeMillis();
                 final List<Friend> friends = FriendDao.getInstance().getNearlyFriendMsg(mLoginUserId);
-                Log.i("Arison", "MessageFragment:run:337:" + JSON.toJSONString(friends));
                 setFriendName(friends, mLoginUserId);
                 long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少200ms的刷新过程
                 if (delayTime < 0) {
@@ -367,7 +364,6 @@ public class MessageFragment extends EasyFragment {
 
                             }
                         }
-                       // Log.i("Arison", "MessageFragment:run:360:" + JSON.toJSONString(mFriendList));
                         mAdapter.notifyDataSetChanged();
                         mPullToRefreshListView.onRefreshComplete();
                     }
@@ -550,8 +546,8 @@ public class MessageFragment extends EasyFragment {
                     //					avatar_img.setImageResource(R.drawable.avatar_normal);
                     avatar_img.setImageResource(R.drawable.qunliao);
                 } else {
-                    if (position>=3)
-                    AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), avatar_img, false);// 目前在备注名放房间的创建者Id
+                    if (position >= 3)
+                        AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), avatar_img, false);// 目前在备注名放房间的创建者Id
                     // avatar_img.setImageResource(R.drawable.qunliao);
                 }
             }
@@ -825,7 +821,6 @@ public class MessageFragment extends EasyFragment {
                     }
                 }
                 if (count != 0) {
-                    Log.i("MessageFragment", "公告 标注红点" + count);
                     String owerId = MyApplication.getInstance().mLoginUser.getUserId();
                     FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_GONGGAO);
                     FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscribeListActivity.java

@@ -5,21 +5,13 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
-import com.android.volley.Response;
-import com.android.volley.VolleyError;
-import com.android.volley.toolbox.StringRequest;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -38,59 +30,14 @@ public class SubscribeListActivity extends BaseActivity {
         initData();
     }
 
-    private void updata() {
-//        String url = "common/desktop/subs/getSubs.action";
-        String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "common/desktop/subs/getSubs.action";
-        Map<String, String> params = new HashMap<>();
-        params.put("count", 2 + "");
-        params.put("condition", "where 1=1");
-        Log.i("gongpengming", url);
-        StringJsonObjectRequest<SubscriptionMessage> request = new StringJsonObjectRequest<SubscriptionMessage>(url, new Response.ErrorListener() {
-            @Override
-            public void onErrorResponse(VolleyError arg0) {
-                Log.i("gongpengming", arg0.getMessage() == null ? "空的" : arg0.getMessage());
-                ToastUtil.showErrorNet(mContext);
-            }
-        }, new StringJsonObjectRequest.Listener<SubscriptionMessage>() {
-            @Override
-            public void onResponse(ObjectResult<SubscriptionMessage> result) {
-                boolean success = Result.defaultParser(mContext, result, true);
-                if (success) {
-                    ToastMessage("操作成功");
-                }
-                Log.i("gongpengming", result.getData().getData_());
-            }
-        }, SubscriptionMessage.class, params);
-        addShortRequest(request);
-    }
-
-    public void updata2() {
-//        String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "common/desktop/subs/getSubs.action?count=2&condition=where 1=1";
-        String url = "http://218.17.158.219:8090/ERP//common/desktop/subs/getSubs.action?count=2&condition=where 1=1";
-        Log.i("gongpengming", url);
-        StringRequest sss = new StringRequest(url, new Response.Listener<String>() {
-            @Override
-            public void onResponse(String s) {
-                Log.i("gongpengming", "ok" + s);
-            }
-        }, new Response.ErrorListener() {
-
-            @Override
-            public void onErrorResponse(VolleyError volleyError) {
-                Log.i("gongpengming", "not" + volleyError.getMessage());
-                Log.i("gongpengming", "not" + volleyError.getLocalizedMessage());
-                Log.i("gongpengming", "not" + volleyError.toString());
-            }
-        });
-        addShortRequest(sss);
-    }
 
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             if (msg.what == 2) {
                 String message = (String) msg.getData().get("result");
-                Log.i("gongpengming", message);
+
+
             } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
                 String message = (String) msg.getData().get("result");
                 Log.i("gongpengming", message);
@@ -104,7 +51,6 @@ public class SubscribeListActivity extends BaseActivity {
         param.put("count", 2);
         param.put("condition", "where 1=1");
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
-        Log.i("gongpengming", CommonUtil.getSharedPreferences(this, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
         ViewUtil.httpSendRequest(this, url, param, handler, headers, 2, null, null, "get");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -1,7 +1,8 @@
 package com.xzjmyk.pm.activity.ui.message;
 
 import android.os.Bundle;
-import android.util.Log;
+import android.os.Handler;
+import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,26 +10,59 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.message.SortSubsrciprion;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
-import com.xzjmyk.pm.activity.db.dao.SubscriptionDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.view.MyListView;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 
 public class SubscriptionActivity extends BaseActivity {
-    private static final int TAG_BIG = 1;
+    private String baseUrl = "http://218.17.158.219:8090/ERP//";
     private PullToRefreshListView listView;
     private ArrayList<SubscriptionMessage> SubscriptionMessages;
     private SubscriptionAdapter adapter;
     private SubscriptionActivity activity = this;
+    private ArrayList<SortSubsrciprion> sortSubsrciprions;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (msg.what == 2) {
+                String message = (String) msg.getData().get("result");
+                try {
+                    JSONObject object = new JSONObject(message);
+                    JSONArray array = object.getJSONArray("data");
+                    SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
+                    setData();
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+            } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
+                //错误信息
+                String message = (String) msg.getData().get("result");
+            }
+        }
+    };
 
     @Override//设置右划退出
     public void setTouch(boolean b) {
@@ -39,58 +73,87 @@ public class SubscriptionActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscription);
-        initView();
-        init2();//初始化数据
-    }
-    private void init() {
-        //TODO 测试保存
-        SubscriptionMessages = new ArrayList<>();
-        SubscriptionMessage message = null;
-        for (int i = 0; i < 5; i++) {
-            message = new SubscriptionMessage();
-            message.setId_(i);
-            message.setData_("2016-10-0" + i);
-            message.setTitle_("这是标题" + i);
-            message.setSon_title_("这是副标题" + i);
-            message.setStatus(1);
-            message.setNum_id(101);
-            message.setInstance_id(101);
-            message.setCreatedate_("201120100");
-            ArrayList<SubscriptionMessage.SubscriptionBean> beans = new ArrayList<>();
-            for (int j = 0; j < 5; j++) {
-                SubscriptionMessage.SubscriptionBean bean = message.getNewBean();
-                bean.setId(j);
-                bean.setImageUrl("http://img0.bdstatic.com/img/image/shouye/xiaoxiao/%E5%8A%A8%E7%89%A9527.jpg");
-                bean.setSubTitle("设个是一个标题，关于内容的标题，是一个简介，第三行会议省略号形式出现" + j);
+        listView = (PullToRefreshListView) findViewById(R.id.listview);
+        listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
+            @Override
+            public void onRefresh(PullToRefreshBase<ListView> refreshView) {
+                cancelData();
+                initData();
             }
-            message.setBeans(beans);
-            SubscriptionMessages.add(message);
-        }
-        long i = SubscriptionDao.getInstance().addMessage(SubscriptionMessages);
+        });
+        initData();
+    }
 
+    private void cancelData() {
+        if (sortSubsrciprions != null) {
+            SubscriptionMessages.clear();
+        }
+        if (SubscriptionMessages != null) {
+            SubscriptionMessages.clear();
+        }
     }
 
-    private void init2() {
-        SubscriptionMessages = SubscriptionDao.getInstance().findAll();
-        Log.i("gong", SubscriptionMessages.size() + "");
+
+    private void setData() {
+
+        if (SubscriptionMessages == null || SubscriptionMessages.size() <= 0) return;
+        saveDataToDB();
+        sortSubsrciprions = new ArrayList<>();
+        SortSubsrciprion sortSubsrciprion = null;
+        for (int i = 0; i < SubscriptionMessages.size(); i++) {
+            sortSubsrciprion = new SortSubsrciprion();
+            sortSubsrciprion.num_id = SubscriptionMessages.get(i).getNUM_ID_();
+            sortSubsrciprion.beans = new ArrayList<>();
+            sortSubsrciprion.beans.add(SubscriptionMessages.get(i));
+            if (sortSubsrciprions.size() > 0) {
+                for (int j = 0; j < sortSubsrciprions.size(); j++) {
+                    if (sortSubsrciprion.num_id == sortSubsrciprions.get(j).num_id) {//如果相同
+                        sortSubsrciprions.get(j).beans.add(SubscriptionMessages.get(i));
+                        break;
+                    } else if (j == (sortSubsrciprions.size() - 1)) {//如果到最后一个都不相同
+                        sortSubsrciprions.add(sortSubsrciprion);
+                        break;
+                    }
+                }
+            } else {
+                sortSubsrciprions.add(sortSubsrciprion);
+            }
+        }
+        adapter = new SubscriptionAdapter();
         listView.setAdapter(adapter);
+        adapter.notifyDataSetChanged();
+        if (listView.isRefreshing()) {
+            listView.setRefreshing(false);
+        }
     }
 
-    private void initView() {
-        listView = (PullToRefreshListView) findViewById(R.id.listview);
-        adapter = new SubscriptionAdapter();
+    private void saveDataToDB() {
+
+    }
+
+
+
+    public void initData() {
+        String url = baseUrl + "common/desktop/subs/getSubs.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("count", 2);
+        param.put("condition", "where to_char(createdate_,'yyyymmdd')='20160612'");
+        param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, 2, null, null, "get");
     }
 
     //外层list
     class SubscriptionAdapter extends BaseAdapter {
         @Override
         public int getCount() {
-            return SubscriptionMessages.size();
+            return sortSubsrciprions.size();
         }
 
         @Override
         public Object getItem(int position) {
-            return SubscriptionMessages.get(position);
+            return sortSubsrciprions.get(position);
         }
 
         @Override
@@ -107,18 +170,22 @@ public class SubscriptionActivity extends BaseActivity {
                 viewholder = new Viewholder();
                 viewholder.tvTime = (TextView) contextView.findViewById(R.id.tvTime);
                 viewholder.listview = (MyListView) contextView.findViewById(R.id.listview);
-                viewholder.adapter = new ListAdapter(SubscriptionMessages.get(position).getBeans());
+                viewholder.adapter = new ListAdapter(sortSubsrciprions.get(position).beans);
                 contextView.setTag(viewholder);
             } else {
                 viewholder = (Viewholder) contextView.getTag();
             }
-            viewholder.tvTime.setText(SubscriptionMessages.get(position).getData_());
             viewholder.listview.setAdapter(viewholder.adapter);
             viewholder.listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                    //TODO 点击跳到web页面
-                    ViewUtil.WebLinks(activity, "http://blog.csdn.net/androidzhaoxiaogang/article/details/8797539", "测试");
+                    SubscriptionMessage bean = sortSubsrciprions.get(position).beans.get(i);
+                    String url = "http://218.17.158.219:8090/ERP//jsps/mobile/charts.jsp?" + "numId=" + bean.getNUM_ID_() +
+                            "&mainId=" + bean.getINSTANCE_ID_() + "&insId=" + bean.getID_() +
+                            "&title=" + bean.getSON_TITLE_();
+                    ViewUtil.WebLinks(activity, url, "订阅");
+
+
                 }
             });
             return contextView;
@@ -135,10 +202,9 @@ public class SubscriptionActivity extends BaseActivity {
 
     //内层list
     class ListAdapter extends BaseAdapter {
+        private ArrayList<SubscriptionMessage> beans;
 
-        private ArrayList<SubscriptionMessage.SubscriptionBean> beans; //当天消息列表
-
-        private ListAdapter(ArrayList<SubscriptionMessage.SubscriptionBean> beans) {
+        private ListAdapter(ArrayList<SubscriptionMessage> beans) {
             this.beans = beans;
         }
 
@@ -174,14 +240,14 @@ public class SubscriptionActivity extends BaseActivity {
             } else {
                 holder = (VieweHolder) contextView.getTag();
             }
-            if (getItemViewType(i) == TAG_BIG) {
+            if (i == 0) {
                 holder.ll.setVisibility(View.GONE);
                 holder.rl.setVisibility(View.VISIBLE);
-                holder.big_tv.setText(beans.get(i).getSubTitle());
+                holder.big_tv.setText(beans.get(i).getTITLE_());
             } else {
                 holder.ll.setVisibility(View.VISIBLE);
                 holder.rl.setVisibility(View.GONE);
-                holder.small_tv.setText(beans.get(i).getSubTitle());
+                holder.small_tv.setText(beans.get(i).getTITLE_());
             }
             return contextView;
         }

WeiChat/src/main/res/layout/bigimage_subscription.xml

@@ -26,7 +26,7 @@
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:padding="5dp"
-            android:src="@drawable/bess" />
+            android:src="@drawable/subg" />
     </LinearLayout>
 
     <RelativeLayout
@@ -41,7 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="fitXY"
-            android:src="@drawable/qzone_phone" />
+            android:src="@drawable/subg" />
 
         <TextView
             android:id="@+id/big_tv"
@@ -49,7 +49,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="10dp"
+            android:background="@color/subscrip_text"
             android:gravity="center_horizontal"
+            android:padding="5dp"
             android:textColor="@color/white"
             android:textSize="16sp" />
     </RelativeLayout>

WeiChat/src/main/res/values/colors.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--by gongpengming-->pop_bg
+    <!--by gongpengming-->
+    <color name="subscrip_text">#60a0a0a0</color>
     <color name="item_color1">#30a0a0a0</color>
     <color name="pop_bg">#aeaeae</color>
     <color name="item_color2">@color/white</color>