合并代码提交 --》

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -213,6 +213,7 @@
         <activity
             android:name=".ui.erp.activity.SubcribeManageActivity"
             android:theme="@style/StyledIndicators" />
+        <activity android:name=".ui.erp.activity.ManageAllSubscriptionActivity"/>
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity" />
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConfig.java

@@ -17,7 +17,7 @@ public class AppConfig {
 	public static final String CONFIG_URL = "http://113.105.74.140:8092/config";
 	//public static final String CONFIG_ URL = "http://192.168.253.155:8092/config";
 	/* 分页的Size */
-	public static final int PAGE_SIZE = 50;
+	public static final int PAGE_SIZE = 500;
 
 	/* 基本地址 */
 	public String apiUrl;// Api 的服务器地址

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -82,12 +82,6 @@ public class MyApplication extends Application {
         //设置重新启动的activity
         CustomActivityOnCrash.setRestartActivityClass(SplashActivity.class);
 
-        /*if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        LeakCanary.install(this);*/
 
         INSTANCE = this;
         ZXingLibrary.initDisplayOpinion(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionAdapter.java

@@ -46,11 +46,11 @@ public class AllSubscriptionAdapter extends BaseAdapter{
         mImageIds = new ArrayList<>();
         mDbManager = new DBManager(mContext);
         progressDialog = CustomProgressDialog.createDialog(mContext);
-        mImageIds.add(R.drawable.ic_subscription_icon1);
-        mImageIds.add(R.drawable.ic_subscription_icon2);
-        mImageIds.add(R.drawable.ic_subscription_icon3);
-        mImageIds.add(R.drawable.ic_subscription_icon4);
-        mImageIds.add(R.drawable.ic_subscription_icon5);
+//        mImageIds.add(R.drawable.ic_subscription_icon1);
+//        mImageIds.add(R.drawable.ic_subscription_icon2);
+//        mImageIds.add(R.drawable.ic_subscription_icon3);
+//        mImageIds.add(R.drawable.ic_subscription_icon4);
+//        mImageIds.add(R.drawable.ic_subscription_icon5);
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java

@@ -48,11 +48,11 @@ public class MySubscriptionAdapter extends BaseAdapter {
         mDbManager = new DBManager(mContext);
         progressDialog = CustomProgressDialog.createDialog(mContext);
         mImageIds = new ArrayList<>();
-        mImageIds.add(R.drawable.ic_subscription_icon1);
-        mImageIds.add(R.drawable.ic_subscription_icon2);
-        mImageIds.add(R.drawable.ic_subscription_icon3);
-        mImageIds.add(R.drawable.ic_subscription_icon4);
-        mImageIds.add(R.drawable.ic_subscription_icon5);
+//        mImageIds.add(R.drawable.ic_subscription_icon1);
+//        mImageIds.add(R.drawable.ic_subscription_icon2);
+//        mImageIds.add(R.drawable.ic_subscription_icon3);
+//        mImageIds.add(R.drawable.ic_subscription_icon4);
+//        mImageIds.add(R.drawable.ic_subscription_icon5);
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/commoninterface/ChangeDataSetInterface.java

@@ -0,0 +1,33 @@
+package com.xzjmyk.pm.activity.commoninterface;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * listview数据源操作接口
+ * Created by RaoMeng on 2016/10/28.
+ */
+
+public interface ChangeDataSetInterface<T> {
+    void setDatas(List<T> datas);
+
+    List<T> getDatas();
+
+    boolean AddItem(T data);
+  
+    boolean AddItem(int position , T data);
+  
+    /** 
+     * deprecate 
+     * 遍历检索效率低，且实际意义不大。 
+     * */  
+    boolean DeleteItem(T data);
+  
+    boolean DeleteItem(int position);  
+  
+    void Clear(); 
+    
+    void AddAll(LinkedList<T> datas);
+    
+    void ReplaceAll(LinkedList<T> datas);
+} 

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

@@ -18,7 +18,7 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
+
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -28,6 +28,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employee;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
@@ -295,7 +296,7 @@ public class DbfindList2Activity extends BaseActivity{
             ViewHolder holder = null;
             if (view == null) {
                 holder = new ViewHolder();
-                view = LayoutInflater.from(ct).inflate(R.layout.meet_select_item, null);
+                view = LayoutInflater.from(ct).inflate(R.layout.business_distribution_item, null);
                 holder.select_scb = (CheckBox) view.findViewById(R.id.select_scb);
                 holder.id_tv = (TextView) view.findViewById(R.id.id_tv);
                 holder.name_tv = (TextView) view.findViewById(R.id.name_tv);
@@ -309,7 +310,12 @@ public class DbfindList2Activity extends BaseActivity{
             holder.select_scb.setClickable(false);
             String str = (StringUtils.isEmpty(users.get(i).getEm_position()) ? "" : (" | " + users.get(i).getEm_position()));
             holder.id_tv.setText(users.get(i).getEm_depart() + str);
-            holder.name_tv.setText( users.get(i).getEm_name());
+            holder.name_tv.setText(users.get(i).getEm_name());
+            if (users.get(i).getEm_id() == 0){
+                holder.head_img.setImageResource(com.xzjmyk.pm.activity.R.drawable.avatar_normal);
+            }else {
+                AvatarHelper.getInstance().display(users.get(i).getEm_id() + "", holder.head_img, true, true);
+            }
             return view;
         }
 
@@ -352,7 +358,7 @@ public class DbfindList2Activity extends BaseActivity{
             DbfindList2Activity.this.finish();
             finish();
         }else {
-            ToastMessage("请选择分配对象");
+            ToastMessage("请选择分配人员");
         }
 
     }

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

@@ -0,0 +1,93 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.SharedUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 未订阅号整理页面
+ * Created by RaoMeng on 2016/10/28.
+ */
+public class ManageAllSubscriptionActivity extends BaseActivity {
+    private DBManager mDbManager;
+    private String currentMaster;//当前账套
+    private String currentUser;//当前账号
+    private List<SubscriptionNumber> dbSubscriptionNumbers;
+    private List<Object> keyStrings;
+    private List<Object> allKeyStrings;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getSupportActionBar().setTitle("未订阅管理");
+        setContentView(R.layout.activity_manage_all_subs);
+
+        initViews();
+        initEvents();
+        initDatas();
+
+    }
+
+    private void initDatas() {
+        Intent intent = new Intent();
+        setResult(Constants.RESULT_MANAGE_ALL_SUBSCRIPTION, intent);
+    }
+
+    private void initEvents() {
+        if (dbSubscriptionNumbers != null && dbSubscriptionNumbers.size() != 0) {
+            for (int i = 0; i < dbSubscriptionNumbers.size(); i++) {
+                SubscriptionNumber subscriptionNumber = dbSubscriptionNumbers.get(i);
+                subscriptionNumber.setRemoved(0);
+                allKeyStrings.add(subscriptionNumber.getType());
+            }
+            mDbManager.updateListAllSubs(dbSubscriptionNumbers);
+        }
+
+        keyStrings = CommonUtil.getSingleElement(allKeyStrings);
+        initKeyStrings();
+//        Toast.makeText(this, "整理完成", Toast.LENGTH_SHORT).show();
+    }
+
+    private void initViews() {
+        keyStrings = new ArrayList<>();
+        allKeyStrings = new ArrayList<>();
+        mDbManager = new DBManager(this);
+        currentMaster = CommonUtil.getSharedPreferences(this, "erp_master");
+        currentUser = CommonUtil.getSharedPreferences(this, "erp_username");
+        dbSubscriptionNumbers =
+                mDbManager.queryFromAllSubs(new String[]{currentMaster, currentUser}, "subs_master=? and subs_username=? ");
+
+    }
+
+    private void initKeyStrings() {
+        StringBuilder keyStringBuilder = null;
+        if (keyStrings.size() != 0) {
+            keyStringBuilder = new StringBuilder();
+            for (int i = 0; i < keyStrings.size(); i++) {
+                keyStringBuilder.append("," + keyStrings.get(i));
+            }
+            if (keyStringBuilder.length() > 2) {
+                keyStringBuilder.delete(0, 1);
+            }
+            SharedUtil.putString(currentMaster + currentUser + "subs", keyStringBuilder.toString());
+        } else {
+            SharedUtil.putString(currentMaster + currentUser + "subs", null);
+        }
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mDbManager.closeDB();
+    }
+}

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

@@ -29,6 +29,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -36,6 +37,12 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
+
+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.List;
@@ -54,7 +61,8 @@ public class NewsTwoActivity extends BaseActivity {
     public EmptyLayout mEmptyLayout;
     private Context ct;
     private int num = 0;
-    private int mCurrentPage = 0;
+    private int currentpage = 1;
+    private List<NewsData> mNewsDataList;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,6 +76,11 @@ public class NewsTwoActivity extends BaseActivity {
         ct = this;
         ViewUtils.inject(this);
         TAG = "NewsTwoActivity";
+
+        mNewsDataList = new ArrayList<>();
+        adapter = new CardItemAdapter(ct, mNewsDataList);
+        mlist.getRefreshableView().setAdapter(adapter);
+
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NEWS);
@@ -92,22 +105,22 @@ public class NewsTwoActivity extends BaseActivity {
                 }
             }
         });
+
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-//                mCurrentPage = 0;
-//                initData();
+                currentpage = 1;
+                initData();
+
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-//                mCurrentPage++;
-//                initData();
+                currentpage++;
+                initData();
             }
         });
     }
-
-
     @Override
     public void onBackPressed() {
         sendResult();
@@ -135,9 +148,9 @@ public class NewsTwoActivity extends BaseActivity {
         progress_bar.setVisibility(View.VISIBLE);
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/news/getNews.action";
         final Map<String, Object> param = new HashMap<>();
-//        param.put("page", mCurrentPage);
-//        param.put("pageSize",10);
-        param.put("count",1000);
+        param.put("page", currentpage);
+        param.put("pageSize",10);
+       // param.put("count",1000);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -147,20 +160,34 @@ public class NewsTwoActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
-                    String result = msg.getData().getString("result");
-                    NewsEntity newsEntity = JSON.parseObject(result, NewsEntity.class);
-                    if (adapter == null) {
-                        adapter = new CardItemAdapter(ct, newsEntity);
-                        mlist.getRefreshableView().setAdapter(adapter);
-                        mlist.setVisibility(View.VISIBLE);
-                        progress_bar.setVisibility(View.GONE);
-                    } else {
-                        adapter.notifyDataSetChanged();
+                    if (currentpage == 1){
+                        mNewsDataList.clear();
+                        ToastMessage("刷新成功");
+                    }else{
+                        ToastMessage("加载完毕");
                     }
-                    if(adapter.getCount()==0){
-                        mEmptyLayout.showEmpty();
+                    String result = msg.getData().getString("result");
+                   // Log.i("handleMessage: ",result);
+                    progress_bar.setVisibility(View.GONE);
+                    mlist.setVisibility(View.VISIBLE);
+                    mlist.onRefreshComplete();
+                    try {
+                        JSONObject resultJsonObject = new JSONObject(result);
+                        JSONArray dataArray = resultJsonObject.getJSONArray("data");
+                        if (currentpage == 1 && dataArray == null && mNewsDataList.isEmpty()){
+                            mEmptyLayout.showEmpty();
+                        }else {
+                            for (int i = 0; i < dataArray.length(); i++) {
+                                JSONObject currentObject = dataArray.getJSONObject(i);
+                                NewsData newsData = JSON.parseObject(currentObject.toString(), NewsData.class);
+                                mNewsDataList.add(newsData);
+                            }
+                            adapter.notifyDataSetChanged();
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
                     }
-                    Log.i(TAG, result);
+
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("result");
@@ -175,30 +202,31 @@ public class NewsTwoActivity extends BaseActivity {
             }
         }
 
-        ;
+
     };
 
 
     public class CardItemAdapter extends BaseAdapter {
-        private NewsEntity newsEntities;
+       // private NewsEntity newsEntities;
+        private List<NewsData> newsDataList;
         private Context ct;
         private LayoutInflater inflater;
 
-        public CardItemAdapter(Context ct, NewsEntity list) {
+        public CardItemAdapter(Context ct, List<NewsData> newsDataList) {
             this.ct = ct;
-            this.newsEntities = list;
+            this.newsDataList = newsDataList;
             this.inflater = LayoutInflater.from(ct);
         }
 
         @Override
         public int getCount() {
-            return newsEntities == null ? 0 : newsEntities.getData().size();
+            return newsDataList == null ? 0 : newsDataList.size();
 
         }
 
         @Override
         public Object getItem(int position) {
-            return newsEntities.getData().get(position);
+            return newsDataList.get(position);
         }
 
         @Override
@@ -232,21 +260,21 @@ public class NewsTwoActivity extends BaseActivity {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
 
             }
-            List<NewsEntity.Data> datas = newsEntities.getData();
 //			model.tv_title.setText(datas.get(position).getNE_THEME());
-            model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss", datas.get(position).getNE_RELEASEDATE()));
+            model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss",
+                    newsDataList.get(position).getNE_RELEASEDATE()));
 
 //			model.tv_count.setText(datas.get(position).getNE_BROWSENUMBER()+"");
-            model.tv_theme.setText(datas.get(position).getNE_THEME());
-            model.tv_author.setText("作者:" + datas.get(position).getNE_RELEASER());
-            model.id = datas.get(position).getNE_ID();
-            if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(), null)) {
-                if (((int) datas.get(position).getSTATUS()) != -1) {
+            model.tv_theme.setText(newsDataList.get(position).getNE_THEME());
+            model.tv_author.setText("作者:" + newsDataList.get(position).getNE_RELEASER());
+            model.id = newsDataList.get(position).getNE_ID();
+            if (!ObjectUtils.isEquals(newsDataList.get(position).getSTATUS(), null)) {
+                if (((int) newsDataList.get(position).getSTATUS()) != -1) {
                     model.img.setImageResource(R.drawable.notice_img_1);
                     model.hasRead = -1;
 
                 } else {
-                    if (((int) datas.get(position).getSTATUS()) == -1) {
+                    if (((int) newsDataList.get(position).getSTATUS()) == -1) {
                         model.img.setImageResource(R.drawable.notice_img_2);
                         model.hasRead = 1;
 

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

@@ -106,7 +106,7 @@ public class NoticeMenuActivity extends BaseActivity {
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条新闻未阅读";
                     } else {
-                        bean.subTitle = "您有暂无未阅读新闻消息";
+                        bean.subTitle = "您暂无未阅读新闻消息";
                     }
                     bean.time = "刚刚";
                     bean.title = "新闻";
@@ -121,7 +121,7 @@ public class NoticeMenuActivity extends BaseActivity {
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条通知未阅读";
                     } else {
-                        bean.subTitle = "您有暂无未阅读通知内容";
+                        bean.subTitle = "您无未阅读通知内容";
                     }
                     bean.time = "刚刚";
                     bean.title = "通知";
@@ -135,7 +135,7 @@ public class NoticeMenuActivity extends BaseActivity {
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条公告未阅读";
                     } else {
-                        bean.subTitle = "您有暂无未阅读公告消息";
+                        bean.subTitle = "您暂无未阅读公告消息";
                     }
                     bean.time = "刚刚";
                     bean.title = "公告";

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

@@ -13,16 +13,19 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.ProgressBar;
 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.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -30,6 +33,11 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
+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.List;
@@ -37,7 +45,7 @@ import java.util.Map;
 
 /**
  * @author Administrator
- * @功能:通知
+ * @功能:通知公告
  */
 public class NoticesActivity extends BaseActivity {
 
@@ -48,6 +56,8 @@ public class NoticesActivity extends BaseActivity {
     private int type;
     private Context ct;
     private int gnum = 0, nnum = 0;
+    private int currentpage = 1;
+    private List<NoticeData> mNoticeData;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,13 +72,18 @@ public class NoticesActivity extends BaseActivity {
     public void initView() {
         TAG = "NoticesActivity";
         ct = this;
-
         getSupportActionBar().setTitle("通知");
+
+        mNoticeData = new ArrayList<>();
+        adapter = new CardItemAdapter(this,mNoticeData);
+        mlist.getRefreshableView().setAdapter(adapter);
+
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
         type = getIntent().getIntExtra("type", 0);
+        mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.getRefreshableView().setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -88,6 +103,20 @@ public class NoticesActivity extends BaseActivity {
 
             }
         });
+
+        mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase refreshView) {
+                currentpage = 1;
+                initData();
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase refreshView) {
+                currentpage++;
+                initData();
+            }
+        });
     }
 
 
@@ -111,7 +140,7 @@ public class NoticesActivity extends BaseActivity {
         Intent intent = new Intent();
         if (type == 1) {//通知
             intent.putExtra(NoticeMenuActivity.NOTICE, nnum);
-        } else {
+        } else { //公告
             intent.putExtra(NoticeMenuActivity.GONGGAO, gnum);
 
         }
@@ -124,7 +153,9 @@ public class NoticesActivity extends BaseActivity {
         progress_bar.setVisibility(View.VISIBLE);
         String url =null;
         final Map<String, Object> param = new HashMap<>();
-        param.put("count", "1000");
+       // param.put("count", "1000");
+        param.put("page",currentpage);
+        param.put("pageSize",10);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (getIntent().getIntExtra("type", 0) == 1) {
             url = Constants.getAppBaseUrl(ct) + "common/desktop/note/inform.action";
@@ -148,35 +179,33 @@ public class NoticesActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
-                    String result = msg.getData().getString("result");
-                    NoticeEntity newsEntity = JSON.parseObject(result, NoticeEntity.class);
-                    if (adapter == null) {
-//                        String em_id = CommonUtil.getSharedPreferences(ct, "erp_emid");
-//                        List<NoticeEntity.Data> fiterdata = new ArrayList<NoticeEntity.Data>();
-//                        for (int i = 0; i < newsEntity.getData().size(); i++) {
-//                            if (newsEntity.getData().get(i).getNO_ISPUBLIC() == 0) {
-//                                if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
-//                                    if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
-//                                        fiterdata.add(newsEntity.getData().get(i));
-//                                    }
-//                               }
-//                            } else {
-//                                fiterdata.add(newsEntity.getData().get(i));
-//                            }
-//                        }
-//                        newsEntity.setData(fiterdata);
-                        adapter = new CardItemAdapter(ct, newsEntity);
-                        mlist.getRefreshableView().setAdapter(adapter);
-                        mlist.setVisibility(View.VISIBLE);
-                        progress_bar.setVisibility(View.GONE);
-
-                    } else {
-                        adapter.notifyDataSetChanged();
+                    if (currentpage == 1){
+                        mNoticeData.clear();
+                        ToastMessage("刷新成功");
+                    }else {
+                        ToastMessage("加载完毕");
                     }
-                    if(adapter.getCount()==0){
-                        mEmptyLayout.showEmpty();
+                    String result = msg.getData().getString("result");
+                    Log.i("handleMessage: ",result);
+                    progress_bar.setVisibility(View.GONE);
+                    mlist.setVisibility(View.VISIBLE);
+                    mlist.onRefreshComplete();
+                    try {
+                        JSONObject resultJsonObject = new JSONObject(result);
+                        JSONArray dataArray = resultJsonObject.getJSONArray("data");
+                        if (currentpage == 1 && dataArray.length() == 0){
+                            mEmptyLayout.showEmpty();
+                        }else {
+                            for (int i = 0; i < dataArray.length(); i++) {
+                                JSONObject currentObject = dataArray.getJSONObject(i);
+                                NoticeData noticeData  = JSON.parseObject(currentObject.toString(), NoticeData.class);
+                                mNoticeData.add(noticeData);
+                            }
+                            adapter.notifyDataSetChanged();
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
                     }
-                    Log.i(TAG, result);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("result");
@@ -195,23 +224,24 @@ public class NoticesActivity extends BaseActivity {
 
     public class CardItemAdapter extends BaseAdapter {
 
-        private NoticeEntity newsEntities;
+       // private NoticeEntity newsEntities;
+        private List<NoticeData> noticeDataList;
         private LayoutInflater inflater;
 
-        public CardItemAdapter(Context ct, NoticeEntity list) {
-            this.newsEntities = list;
+        public CardItemAdapter(Context ct, List<NoticeData> noticeDataList) {
+            this.noticeDataList = noticeDataList;
             this.inflater = LayoutInflater.from(ct);
         }
 
         @Override
         public int getCount() {
-            return newsEntities == null ? 0 : newsEntities.getData().size();
+            return noticeDataList == null ? 0 : noticeDataList.size();
 
         }
 
         @Override
         public Object getItem(int position) {
-            return newsEntities.getData().get(position);
+            return noticeDataList.get(position);
         }
 
         @Override
@@ -243,26 +273,26 @@ public class NoticesActivity extends BaseActivity {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
             }
 
-            List<NoticeEntity.Data> datas = newsEntities.getData();
+           // List<NoticeData> noticeDataList = noticeDataList;
 //			model.tv_title.setText(datas.get(position).getNO_TITLE());
             model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss",
-                    datas.get(position).getNO_APPTIME()));
-            model.tv_theme.setText(datas.get(position).getNO_TITLE().replace("&nbsp;",""));
-            model.tv_author.setText(datas.get(position).getNO_APPROVER());
-            model.id = datas.get(position).getNO_ID();
-            model.hasRead = datas.get(position).getSTATUS() == null ? -1 : (int) datas.get(position).getSTATUS();
-            if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(), null)) {
-                if (((int) datas.get(position).getSTATUS()) != -1) {
+                    noticeDataList.get(position).getNO_APPTIME()));
+            model.tv_theme.setText(noticeDataList.get(position).getNO_TITLE().replace("&nbsp;",""));
+            model.tv_author.setText(noticeDataList.get(position).getNO_APPROVER());
+            model.id = noticeDataList.get(position).getNO_ID();
+            model.hasRead = noticeDataList.get(position).getSTATUS() == null ? -1 : (int) noticeDataList.get(position).getSTATUS();
+            if (!ObjectUtils.isEquals(noticeDataList.get(position).getSTATUS(), null)) {
+                if (((int) noticeDataList.get(position).getSTATUS()) != -1) {
                     model.img.setImageResource(R.drawable.notice_img_1);
                 } else {
-                    if (((int) datas.get(position).getSTATUS()) == -1) {
+                    if (((int) noticeDataList.get(position).getSTATUS()) == -1) {
                         model.img.setImageResource(R.drawable.notice_img_2);
                     }
                 }
             } else {
                 model.img.setImageResource(R.drawable.notice_img_1);
             }
-            
+
 //			model.tv_count.setVisibility(View.GONE);
             return convertView;
         }

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

@@ -1,7 +1,10 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.viewpagerindicator.TabPageIndicator;
 import com.viewpagerindicator.UnderlinePageIndicator;
@@ -11,6 +14,7 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.SubscribeManegeVpAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.BaseFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionAllFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionMyFragment;
+import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.view.NoSlideViewpager;
 
 import java.util.ArrayList;
@@ -28,6 +32,7 @@ public class SubcribeManageActivity extends BaseActivity{
     private SubscribeManegeVpAdapter mSubscribeManegeVpAdapter;
     private NoSlideViewpager mViewPager;
     private List<String> mTitleStrings;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -56,4 +61,35 @@ public class SubcribeManageActivity extends BaseActivity{
         mUnderlinePageIndicator.setViewPager(mViewPager);
         mTabPageIndicator.setOnPageChangeListener(mUnderlinePageIndicator);
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_apply_subscribe,menu);
+        MenuItem item = menu.getItem(0);
+        item.setTitle("整理");
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.subscribe_apply){
+//            Toast.makeText(SubcribeManageActivity.this, "订阅整理", Toast.LENGTH_SHORT).show();
+            Intent intent = new Intent();
+            intent.setClass(this,ManageAllSubscriptionActivity.class);
+            startActivityForResult(intent, Constants.REQUEST_MANAGE_ALL_SUBSCRIPTON);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == Constants.REQUEST_MANAGE_ALL_SUBSCRIPTON
+                && resultCode == Constants.RESULT_MANAGE_ALL_SUBSCRIPTION
+                && data != null){
+            mTabPageIndicator.setCurrentItem(0);
+            mUnderlinePageIndicator.setCurrentItem(0);
+            SubscriptionAllFragment item = (SubscriptionAllFragment) mSubscribeManegeVpAdapter.getItem(0);
+            item.getDbSubsData();
+        }
+    }
 }

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

@@ -79,6 +79,7 @@ public class TaskActivity extends BaseActivity {
                 } else {
                     adapter = new SchedultAdapter(TaskActivity.this, allList);
                     listview_main.setAdapter(adapter);
+                    ToastMessage("想要查看具体任务情况，请点击进入");
                 }
                 listview_main.onRefreshComplete();
             } else if (msg.what == 0) {
@@ -161,7 +162,7 @@ public class TaskActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.task_listview);
-        ToastMessage("想要查看具体任务情况，请点击进入");
+
         context = TaskActivity.this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("我的任务");
@@ -304,6 +305,7 @@ public class TaskActivity extends BaseActivity {
         if (reString != null && !reString.equals("500")) {
             Map<String, Object> results = FlexJsonUtil.fromJson(reString);
             if (results.get("allProcess") != null) {
+
                 String count = results.get("count").toString();
                 Intent intent_update = new Intent("com.activity.update.data");
                 getSharedPreferences("setting", MODE_PRIVATE).edit().putString("count", count).commit();
@@ -321,7 +323,7 @@ public class TaskActivity extends BaseActivity {
                     if (allProcesses.get(i).getTypecode().contains("task")) {
                         taskProcess.add(allProcesses.get(i));
                     }
-                    ;
+
                 }
                 if (!taskProcess.isEmpty()) {
                     intent_update.putExtra("count", String.valueOf(taskProcess.size()));

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

@@ -0,0 +1,31 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.message;
+
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+
+public class ProcessMsgActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_process_msg);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                        .setAction("Action", null).show();
+            }
+        });
+    }
+
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AlarmaActivity.java

@@ -47,7 +47,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_oa__alarma);
+        setContentView(R.layout.activity_oa_alarma);
         ViewUtils.inject(this);
         initView();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AutoSignReceiver.java

@@ -0,0 +1,19 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.xzjmyk.pm.activity.util.TimeUtils;
+
+/**
+ * Created by FANGlh on 2016/10/27.
+ */
+public class AutoSignReceiver extends BroadcastReceiver {
+
+    private String c_time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");//获取当前时间的时分
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+}

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

@@ -1,13 +1,17 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -42,12 +46,13 @@ import java.util.Map;
  * 所有订阅
  * Created by RaoMeng on 2016/9/5.
  */
+
 public class SubscriptionAllFragment extends BaseFragment {
     private PullToRefreshListView mPullToRefreshListView;
     private AllSubscriptionAdapter mAllSubscriptionAdapter;
     private EmptyLayout mEmptyLayout;
     private int rbPos = 0;
-    private List<String> keyStrings = new ArrayList<>();
+    private List<String> keyStrings = new ArrayList<>();//当前显示的订阅类
     private final static int SUBSCRIBE_DETAIL_REQUEST = 33;
     private static int mClickedPos = -1;
     private String currentMaster;//当前账套
@@ -80,8 +85,8 @@ public class SubscriptionAllFragment extends BaseFragment {
         currentUser = CommonUtil.getSharedPreferences(getActivity(), "erp_username");
         mPullToRefreshListView = (PullToRefreshListView) root.findViewById(R.id.subscription_all_ptlv);
         mSubscriptionNumbers = new ArrayList<>();
-        mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mSubscriptionNumbers);
         mAllSubscriptonKindMessages = new ArrayList<>();
+        mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mSubscriptionNumbers);
 
         mDbAllSubscriptonKindMessages = new ArrayList<>();
         mDbSubscriptionNumbers = new ArrayList<>();
@@ -128,14 +133,14 @@ public class SubscriptionAllFragment extends BaseFragment {
                 Intent intent = new Intent();
                 intent.setClass(getActivity(), SubscribeDetailActivity.class);
                 intent.putExtra("flag", "all");
-                intent.putExtra("subId", mSubscriptionNumbers.get(position - 1).getId());
-                intent.putExtra("subTitle", mSubscriptionNumbers.get(position - 1).getTitle());
-                intent.putExtra("subStatus", mSubscriptionNumbers.get(position - 1).getStatus());
+                intent.putExtra("subId", mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).getId());
+                intent.putExtra("subTitle", mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).getTitle());
+                intent.putExtra("subStatus", mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).getStatus());
                 startActivityForResult(intent, SUBSCRIBE_DETAIL_REQUEST);
             }
         });
 
-        /*mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+        mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
                 View popView = View.inflate(getActivity(), R.layout.pop_subs_delete, null);
@@ -147,10 +152,9 @@ public class SubscriptionAllFragment extends BaseFragment {
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).setRemoved(1);
                         mDbManager.updateAllSubs(mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1));
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().remove(position - 1);
-                        
-                        
+
                         mAllSubscriptionAdapter.notifyDataSetChanged();
-                        mAllSubscriptonKindMessages.get(rbPos).setSubscriptionNumbers( mAllSubscriptionAdapter.getmSubscriptionNumbers());
+                        mAllSubscriptonKindMessages.get(rbPos).setSubscriptionNumbers(mAllSubscriptionAdapter.getmSubscriptionNumbers());
 
                         if (mAllSubscriptionAdapter.getmSubscriptionNumbers().size() == 0) {
                             mAllSubscriptonKindMessages.remove(rbPos);
@@ -170,6 +174,8 @@ public class SubscriptionAllFragment extends BaseFragment {
                                 mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                                 mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                                 mAllSubscriptionAdapter.notifyDataSetChanged();
+//                                mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+//                                mPullToRefreshListView.getRefreshableView().setAdapter(mAllSubscriptionAdapter);
 
                             }
                         }
@@ -192,7 +198,7 @@ public class SubscriptionAllFragment extends BaseFragment {
 
                 return true;
             }
-        });*/
+        });
 
         mTypeListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -201,15 +207,11 @@ public class SubscriptionAllFragment extends BaseFragment {
                 mSubsTypeAdapter.notifyDataSetChanged();
                 rbPos = position;
                 if (mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers().size() != 0) {
-//                    mSubscriptionNumbers.clear();
-//                    mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-//                    mAllSubscriptionAdapter.notifyDataSetChanged();
-                    mAllSubscriptionAdapter =new AllSubscriptionAdapter(getActivity(),mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                    mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                     mPullToRefreshListView.getRefreshableView().setAdapter(mAllSubscriptionAdapter);
                 }
             }
         });
-/*
         mTypeListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
@@ -263,7 +265,7 @@ public class SubscriptionAllFragment extends BaseFragment {
 
                 return true;
             }
-        });*/
+        });
     }
 
     private void initKeyStrings() {
@@ -300,68 +302,73 @@ public class SubscriptionAllFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
-        //每次初始化页面都需要访问网络数据用来更新本地缓存
-        sendAllSubscriptionRequest();
+        if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
+            //每次初始化页面都需要访问网络数据用来更新本地缓存
+            sendAllSubscriptionRequest();
+        }else {
+            //没有网络时，取本地数据库数据
+            getDbSubsData();
+        }
 
-        /*Log.d("currentMaster: ", currentMaster);
+    }
+
+    /**
+     * 获取本地数据库全部订阅
+     */
+    public void getDbSubsData() {
+        mAllSubscriptonKindMessages.clear();
         String cacheKeys = SharedUtil.getString(currentMaster + currentUser + "subs");
         if (cacheKeys != null) {
             String[] cacheKeysArray = cacheKeys.split(",");
+            keyStrings.clear();
             for (int i = 0; i < cacheKeysArray.length; i++) {
                 keyStrings.add(cacheKeysArray[i]);
             }
         }
-        try {
-            List<SubscriptionNumber> dbSubscriptionNumbers
-                    = mDbManager.queryFromAllSubs(new String[]{currentMaster, currentUser}, "subs_master=? and subs_username=? ");
-            if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
-//            if (true) {
-                sendAllSubscriptionRequest();
-//                Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
+        rbPos = 0;
+        List<SubscriptionNumber> dbSubscriptionNumbers
+                = mDbManager.queryFromAllSubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
+        if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
+            mEmptyLayout.showEmpty();
+        } else {
+            if (keyStrings.size() == 0) {
+                mSubsTypeAdapter.notifyDataSetChanged();
+                initKeyStrings();
+                mTypeListView.setVisibility(View.GONE);
+                mEmptyLayout.showEmpty();
+                mSubscriptionNumbers.clear();
+                mAllSubscriptionAdapter.notifyDataSetChanged();
             } else {
-//                Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
-                if (keyStrings.size() == 0) {
-                    mSubsTypeAdapter.notifyDataSetChanged();
-                    initKeyStrings();
-                    mTypeListView.setVisibility(View.GONE);
-                    mEmptyLayout.showEmpty();
-                    mSubscriptionNumbers.clear();
-                    mAllSubscriptionAdapter.notifyDataSetChanged();
-                } else {
-                    mTypeListView.setVisibility(View.VISIBLE);
-                    mSubsTypeAdapter.notifyDataSetChanged();
-                    initKeyStrings();
-                    for (int i = 0; i < keyStrings.size(); i++) {
-                        AllSubscriptonKindMessage tempSubscriptonKindMessage = new AllSubscriptonKindMessage();
-                        List<SubscriptionNumber> tempSubscriptionNumbers = new ArrayList<>();
-                        String currentKey = keyStrings.get(i);
-                        for (int j = 0; j < dbSubscriptionNumbers.size(); j++) {
-                            SubscriptionNumber currentSubscriptionNumber = dbSubscriptionNumbers.get(j);
-                            if (currentSubscriptionNumber.getType().equals(currentKey)) {
-                                tempSubscriptionNumbers.add(currentSubscriptionNumber);
-                            }
+                mTypeListView.setVisibility(View.VISIBLE);
+                mSubsTypeAdapter.notifyDataSetChanged();
+                initKeyStrings();
+                for (int i = 0; i < keyStrings.size(); i++) {
+                    AllSubscriptonKindMessage tempSubscriptonKindMessage = new AllSubscriptonKindMessage();
+                    List<SubscriptionNumber> tempSubscriptionNumbers = new ArrayList<>();
+                    String currentKey = keyStrings.get(i);
+                    for (int j = 0; j < dbSubscriptionNumbers.size(); j++) {
+                        SubscriptionNumber currentSubscriptionNumber = dbSubscriptionNumbers.get(j);
+                        if (currentSubscriptionNumber.getType().equals(currentKey)) {
+                            tempSubscriptionNumbers.add(currentSubscriptionNumber);
                         }
-                        tempSubscriptonKindMessage.setSubscriptionKind(currentKey);
-                        tempSubscriptonKindMessage.setSubscriptionNumbers(tempSubscriptionNumbers);
-
-                        mAllSubscriptonKindMessages.add(tempSubscriptonKindMessage);
                     }
-                    mSubscriptionNumbers.clear();
-                    mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-                    Log.d("allsubscription:", mSubscriptionNumbers.toString());
-                    mAllSubscriptionAdapter.notifyDataSetChanged();
+                    tempSubscriptonKindMessage.setSubscriptionKind(currentKey);
+                    tempSubscriptonKindMessage.setSubscriptionNumbers(tempSubscriptionNumbers);
+                    mAllSubscriptonKindMessages.add(tempSubscriptonKindMessage);
                 }
-
+                mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
+                mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                Log.d("allsubscription:", mSubscriptionNumbers.toString());
+                mAllSubscriptionAdapter.notifyDataSetChanged();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
+        }
     }
 
+
     /**
-     * 获取全部订阅
+     * 获取网络数据全部订阅
      */
-    private void sendAllSubscriptionRequest() {
+    public void sendAllSubscriptionRequest() {
         //取出本地缓存数据
         mDbSubscriptionNumbers = mDbManager.queryFromAllSubs(new String[]{currentMaster, currentUser}, "subs_master=? and subs_username=? ");
         progressDialog.show();
@@ -461,15 +468,16 @@ public class SubscriptionAllFragment extends BaseFragment {
                     if (keyStrings.size() == 0) {
                         mTypeListView.setVisibility(View.GONE);
                         initKeyStrings();
-                        mSubscriptionNumbers.clear();
+                        mEmptyLayout.showEmpty();
+                        mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     } else {
                         mTypeListView.setVisibility(View.VISIBLE);
                         mSubsTypeAdapter.notifyDataSetChanged();
                         initKeyStrings();
-                        mSubscriptionNumbers.clear();
-                        mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-                        Log.d("allsubscription:", mSubscriptionNumbers.toString());
+                        mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
+                        mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                        Log.d("allsubscription:", mAllSubscriptionAdapter.getmSubscriptionNumbers().toString());
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     }
 
@@ -481,6 +489,9 @@ public class SubscriptionAllFragment extends BaseFragment {
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Crouton.makeText(getActivity(), msg.getData().getString("result"), Style.ALERT).show();
+                    if (mPullToRefreshListView.isRefreshing()){
+                        mPullToRefreshListView.onRefreshComplete();
+                    }
                     break;
             }
         }
@@ -491,10 +502,16 @@ public class SubscriptionAllFragment extends BaseFragment {
         if (requestCode == SUBSCRIBE_DETAIL_REQUEST && resultCode == 9 && data != null) {
             int statu = data.getIntExtra("status", 0);
             if (mClickedPos != -1) {
-                mSubscriptionNumbers.get(mClickedPos - 1).setStatus(statu);
-                mDbManager.updateAllSubs(mSubscriptionNumbers.get(mClickedPos - 1));
+                mAllSubscriptionAdapter.getmSubscriptionNumbers().get(mClickedPos - 1).setStatus(statu);
+                mDbManager.updateAllSubs(mAllSubscriptionAdapter.getmSubscriptionNumbers().get(mClickedPos - 1));
                 mAllSubscriptionAdapter.notifyDataSetChanged();
             }
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mDbManager.closeDB();
+    }
 }

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

@@ -105,14 +105,12 @@ public class SubscriptionMyFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
-//        List<PersonalSubscriptionBean> dbPersonalSubscriptionBeans = mDbManager.queryFromMySubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
-//        if (dbPersonalSubscriptionBeans == null || dbPersonalSubscriptionBeans.size() == 0){
-        if (true){
-//            Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
+        List<PersonalSubscriptionBean> dbPersonalSubscriptionBeans = mDbManager.queryFromMySubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
+        if (dbPersonalSubscriptionBeans == null
+                || dbPersonalSubscriptionBeans.size() == 0
+                || CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
             sendSubscriptionRequest();
         }else {
-            List<PersonalSubscriptionBean> dbPersonalSubscriptionBeans = mDbManager.queryFromMySubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
-            Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
             mPersonalSubscriptionBeans.clear();
             mPersonalSubscriptionBeans.addAll(dbPersonalSubscriptionBeans);
             mMySubscriptionAdapter.notifyDataSetChanged();
@@ -204,4 +202,10 @@ public class SubscriptionMyFragment extends BaseFragment {
             }
         }
     };
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mDbManager.closeDB();
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/NewsData.java

@@ -0,0 +1,134 @@
+package com.xzjmyk.pm.activity.ui.erp.model;
+
+/**
+ * Created by FANGlh on 2016/10/28.
+ */
+public class NewsData {
+
+    private int   NE_ID;
+    private Object	NE_NKID;
+    private String  NE_RELEASER;//作者
+    private String	NE_THEME;//
+    private Long NE_RELEASEDATE;//时间
+    private int	NE_BROWSENUMBER;//浏览量
+    private String	NE_TYPE;//新闻类型
+    private String	NE_CODE;
+    private String	NE_CONTENT;//响应正文
+    private Object	NE_FEEL;
+    private Object	NE_ATTACHS;
+    private int		NE_ISTOP;//是否公开
+    private int		RN;//编号
+    private Object	STATUS;//状态
+
+    public int getNE_ID() {
+        return NE_ID;
+    }
+
+    public void setNE_ID(int NE_ID) {
+        this.NE_ID = NE_ID;
+    }
+
+    public Object getNE_NKID() {
+        return NE_NKID;
+    }
+
+    public void setNE_NKID(Object NE_NKID) {
+        this.NE_NKID = NE_NKID;
+    }
+
+    public String getNE_RELEASER() {
+        return NE_RELEASER;
+    }
+
+    public void setNE_RELEASER(String NE_RELEASER) {
+        this.NE_RELEASER = NE_RELEASER;
+    }
+
+    public String getNE_THEME() {
+        return NE_THEME;
+    }
+
+    public void setNE_THEME(String NE_THEME) {
+        this.NE_THEME = NE_THEME;
+    }
+
+    public Long getNE_RELEASEDATE() {
+        return NE_RELEASEDATE;
+    }
+
+    public void setNE_RELEASEDATE(Long NE_RELEASEDATE) {
+        this.NE_RELEASEDATE = NE_RELEASEDATE;
+    }
+
+    public int getNE_BROWSENUMBER() {
+        return NE_BROWSENUMBER;
+    }
+
+    public void setNE_BROWSENUMBER(int NE_BROWSENUMBER) {
+        this.NE_BROWSENUMBER = NE_BROWSENUMBER;
+    }
+
+    public String getNE_TYPE() {
+        return NE_TYPE;
+    }
+
+    public void setNE_TYPE(String NE_TYPE) {
+        this.NE_TYPE = NE_TYPE;
+    }
+
+    public String getNE_CODE() {
+        return NE_CODE;
+    }
+
+    public void setNE_CODE(String NE_CODE) {
+        this.NE_CODE = NE_CODE;
+    }
+
+    public String getNE_CONTENT() {
+        return NE_CONTENT;
+    }
+
+    public void setNE_CONTENT(String NE_CONTENT) {
+        this.NE_CONTENT = NE_CONTENT;
+    }
+
+    public Object getNE_FEEL() {
+        return NE_FEEL;
+    }
+
+    public void setNE_FEEL(Object NE_FEEL) {
+        this.NE_FEEL = NE_FEEL;
+    }
+
+    public Object getNE_ATTACHS() {
+        return NE_ATTACHS;
+    }
+
+    public void setNE_ATTACHS(Object NE_ATTACHS) {
+        this.NE_ATTACHS = NE_ATTACHS;
+    }
+
+    public int getNE_ISTOP() {
+        return NE_ISTOP;
+    }
+
+    public void setNE_ISTOP(int NE_ISTOP) {
+        this.NE_ISTOP = NE_ISTOP;
+    }
+
+    public int getRN() {
+        return RN;
+    }
+
+    public void setRN(int RN) {
+        this.RN = RN;
+    }
+
+    public Object getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(Object STATUS) {
+        this.STATUS = STATUS;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/NoticeData.java

@@ -0,0 +1,145 @@
+package com.xzjmyk.pm.activity.ui.erp.model;
+
+/**
+ * Created by FANGlh on 2016/10/28.
+ */
+public class NoticeData {
+    private int NO_ID;
+
+    private String NO_TITLE;
+
+    private String NO_APPROVER;
+
+    private Long NO_APPTIME;
+
+    private String NO_INFOTYPE;
+
+    private String NO_EMERGENCY;
+
+    private Object NO_KEYWORD;//公告
+
+    private String NO_CONTENT;
+
+    private int NO_ISTOP;
+
+    private int NO_ISREAD;//
+
+    private int NO_ISPUBLIC;
+
+    private int RN;
+    private Object NO_RECIPIENTID;
+
+    private Object STATUS;
+
+    public Object getNO_RECIPIENTID() {
+        return NO_RECIPIENTID;
+    }
+
+    public void setNO_RECIPIENTID(Object NO_RECIPIENTID) {
+        this.NO_RECIPIENTID = NO_RECIPIENTID;
+    }
+
+    public int getNO_ID() {
+        return NO_ID;
+    }
+
+    public void setNO_ID(int NO_ID) {
+        this.NO_ID = NO_ID;
+    }
+
+    public String getNO_TITLE() {
+        return NO_TITLE;
+    }
+
+    public void setNO_TITLE(String NO_TITLE) {
+        this.NO_TITLE = NO_TITLE;
+    }
+
+    public String getNO_APPROVER() {
+        return NO_APPROVER;
+    }
+
+    public void setNO_APPROVER(String NO_APPROVER) {
+        this.NO_APPROVER = NO_APPROVER;
+    }
+
+    public Long getNO_APPTIME() {
+        return NO_APPTIME;
+    }
+
+    public void setNO_APPTIME(Long NO_APPTIME) {
+        this.NO_APPTIME = NO_APPTIME;
+    }
+
+    public String getNO_INFOTYPE() {
+        return NO_INFOTYPE;
+    }
+
+    public void setNO_INFOTYPE(String NO_INFOTYPE) {
+        this.NO_INFOTYPE = NO_INFOTYPE;
+    }
+
+    public String getNO_EMERGENCY() {
+        return NO_EMERGENCY;
+    }
+
+    public void setNO_EMERGENCY(String NO_EMERGENCY) {
+        this.NO_EMERGENCY = NO_EMERGENCY;
+    }
+
+    public Object getNO_KEYWORD() {
+        return NO_KEYWORD;
+    }
+
+    public void setNO_KEYWORD(Object NO_KEYWORD) {
+        this.NO_KEYWORD = NO_KEYWORD;
+    }
+
+    public String getNO_CONTENT() {
+        return NO_CONTENT;
+    }
+
+    public void setNO_CONTENT(String NO_CONTENT) {
+        this.NO_CONTENT = NO_CONTENT;
+    }
+
+    public int getNO_ISTOP() {
+        return NO_ISTOP;
+    }
+
+    public void setNO_ISTOP(int NO_ISTOP) {
+        this.NO_ISTOP = NO_ISTOP;
+    }
+
+    public int getNO_ISREAD() {
+        return NO_ISREAD;
+    }
+
+    public void setNO_ISREAD(int NO_ISREAD) {
+        this.NO_ISREAD = NO_ISREAD;
+    }
+
+    public int getNO_ISPUBLIC() {
+        return NO_ISPUBLIC;
+    }
+
+    public void setNO_ISPUBLIC(int NO_ISPUBLIC) {
+        this.NO_ISPUBLIC = NO_ISPUBLIC;
+    }
+
+    public int getRN() {
+        return RN;
+    }
+
+    public void setRN(int RN) {
+        this.RN = RN;
+    }
+
+    public Object getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(Object STATUS) {
+        this.STATUS = STATUS;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -69,8 +69,10 @@ import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -1125,4 +1127,21 @@ public class CommonUtil {
         }
     }
 
+    /**
+     * 去除集合中相同元素
+     * @param datas
+     * @return
+     */
+    public static List<Object> getSingleElement(List<Object> datas){
+        List<Object> resultList = new ArrayList<>();
+        Iterator<Object> iterator = datas.iterator();
+        while (iterator.hasNext()){
+            Object next = iterator.next();
+            if (!resultList.contains(next)){
+                resultList.add(next);
+            }
+        }
+        return resultList;
+    }
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/Constants.java

@@ -25,5 +25,7 @@ public class Constants {
 
     public  static String IS_NOTIFICATION="is_notification";//是是否进行通知
 
-    
+    public final static int REQUEST_MANAGE_ALL_SUBSCRIPTON = 101;
+    public final static int RESULT_MANAGE_ALL_SUBSCRIPTION = 102;
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/NoSlideViewpager.java

@@ -9,6 +9,7 @@ import android.view.MotionEvent;
  * Created by RaoMeng on 2016/9/5.
  */
 public class NoSlideViewpager extends ViewPager {
+    //true时不可滑动，false时可滑动
     private boolean noSlide = false;
 
     public NoSlideViewpager(Context context) {

WeiChat/src/main/res/drawable-hdpi/umeng_socialize_title_back_bt.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/umeng_socialize_title_back_bt_normal" android:state_pressed="false" android:state_window_focused="false"/>
+    <item android:drawable="@drawable/umeng_socialize_title_back_bt_selected" android:state_pressed="true" android:state_window_focused="true"/>
+    <item android:drawable="@drawable/umeng_socialize_title_back_bt_selected" android:state_focused="true"/>
+
+</selector>

WeiChat/src/main/res/drawable-hdpi/umeng_socialize_title_right_bt.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/umeng_socialize_title_right_bt_normal" android:state_pressed="false" android:state_window_focused="false"/>
+    <item android:drawable="@drawable/umeng_socialize_title_right_bt_selected" android:state_pressed="true" android:state_window_focused="true"/>
+    <item android:drawable="@drawable/umeng_socialize_title_right_bt_selected" android:state_focused="true"/>
+
+</selector>

WeiChat/src/main/res/drawable/shape_process_item.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>

WeiChat/src/main/res/drawable/shape_process_linear.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>

WeiChat/src/main/res/drawable/shape_process_selected.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <layer-list>
+            <item android:bottom="0.5dp" android:left="-1dp" android:right="-1dp" android:top="-1dp">
+                <shape>
+                    <solid android:color="#00F5FF" />
+                    <stroke android:width="0.5dp" android:color="#00F5FF" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_selected="true">
+        <layer-list>
+            <item android:bottom="0.0dp" android:left="-2.7dp" android:right="-2.7dp" android:top="-2.7dp">
+                <shape>
+                    <solid android:color="@color/white" />
+                    <stroke android:width="2.5dp" android:color="@color/yellow_home" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item android:bottom="0.5dp" android:left="-1dp" android:right="-1dp" android:top="-1dp">
+                <shape>
+                    <solid android:color="@color/white" />
+                    <stroke android:width="0.5dp" android:color="@color/white" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>

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

@@ -0,0 +1,12 @@
+<?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">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="未订阅整理页面"/>
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:fitsSystemWindows="true"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity">
+
+    <android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
+        android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar android:id="@+id/toolbar"
+            android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_process_msg" />
+
+    <android.support.design.widget.FloatingActionButton android:id="@+id/fab"
+        android:layout_width="wrap_content" android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin"
+        android:src="@android:drawable/ic_dialog_email" />
+
+</android.support.design.widget.CoordinatorLayout>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height"
+    android:background="@color/bg_main"
+    android:padding="8dp">
+
+    <CheckBox
+        android:id="@+id/select_scb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@null"
+        android:checked="false"
+        android:drawableLeft="@drawable/oa_rb_button_bg"
+        android:padding="10dp" />
+
+    <ImageView
+        android:id="@+id/head_img"
+        android:layout_width="38dp"
+        android:layout_height="38dp"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/select_scb"
+        android:src="@drawable/friend_u"
+        android:visibility="visible" />
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/head_img"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/id_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/name_tv"
+        android:layout_below="@+id/name_tv"
+        android:layout_marginTop="8dp"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+</RelativeLayout>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:showIn="@layout/activity_process_msg"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity">
+
+</RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
@@ -9,15 +10,17 @@
         android:layout_width="80dp"
         android:layout_height="match_parent"
         android:background="#FFE2E0E0"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <View
         android:layout_width="1dp"
         android:layout_height="match_parent"
-        android:background="@color/item_line"/>
+        android:background="@color/item_line" />
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/subscription_all_ptlv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:divider="@color/item_line"
-        android:dividerPadding="1dp"/>
+        android:dividerPadding="1dp" />
 </LinearLayout>

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

@@ -90,7 +90,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="2px"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="5dp"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -153,7 +153,7 @@
                 android:layout_alignLeft="@id/date_tv"
                 android:layout_below="@+id/location_tv"
                 android:layout_marginTop="5dp"
-                android:maxLines="2"
+                android:maxLines="3"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
 

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/top"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize">
+    <ImageView
+        android:id="@+id/back"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="10dp"
+        android:src="@drawable/back" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:drawableRight="@drawable/down"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_main" />
+
+    <ImageView
+        android:id="@+id/seting"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:padding="8dp"
+        android:src="@drawable/setting" />
+</RelativeLayout>

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <include
+        android:id="@+id/umeng_socialize_titlebar"
+        layout="@layout/umeng_socialize_titile_bar" />
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_follow"
+        android:layout_width="fill_parent"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:background="#AAAAAA"
+        android:visibility="visible" >
+
+        <CheckBox
+            android:id="@+id/umeng_socialize_follow_check"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:visibility="gone"
+            android:checked="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/umeng_socialize_follow_check"
+            android:textSize="16sp"
+            android:text="关注官方微博"
+            android:visibility="gone"
+            android:textColor="#f8f8f8" />
+    </RelativeLayout>
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@id/umeng_socialize_follow"
+        android:layout_below="@id/umeng_socialize_titlebar" />
+
+    <RelativeLayout
+        android:id="@+id/progress_bar_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/umeng_socialize_titlebar"
+        android:background="#66000000" >
+
+        <LinearLayout
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal" >
+
+            <ProgressBar
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="10dp" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="48dp"
+    android:background="#EEEEEE"
+     >
+
+    <Button
+        android:id="@+id/umeng_socialize_title_bar_leftBt"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_alignParentLeft="true"
+        android:background="@drawable/umeng_socialize_title_back_bt"
+        android:layout_centerVertical="true"
+        android:textColor="#ffffff"
+        android:layout_marginLeft="8dp"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/umeng_socialize_title_bar_middleTv"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_centerHorizontal="true"
+        android:gravity="center"
+        android:layout_centerVertical="true"
+        android:text="@string/umeng_socialize_comment"
+        android:textColor="@color/umeng_socialize_text_title"
+        android:textSize="20sp" />
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_title_bar_middle_tab"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_horizontal"
+        android:visibility="gone" >
+
+        <Button
+            android:id="@+id/umeng_socialize_title_middle_left"
+            android:layout_width="98dp"
+            android:layout_height="fill_parent"
+
+            android:text="@string/umeng_socialize_near_At"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+
+        <Button
+            android:id="@+id/umeng_socialize_title_middle_right"
+            android:layout_width="98dp"
+            android:layout_height="fill_parent"
+            android:layout_toRightOf="@id/umeng_socialize_title_middle_left"
+
+            android:text="@string/umeng_socialize_friends"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="48dp"
+        android:layout_height="fill_parent"
+        android:layout_alignParentRight="true"
+        android:gravity="center_horizontal" >
+
+        <Button
+            android:id="@+id/umeng_socialize_title_bar_rightBt"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:background="@drawable/umeng_socialize_title_right_bt"
+            android:layout_centerVertical="true"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+
+        <ProgressBar
+            android:id="@+id/umeng_socialize_title_bar_rightBt_progress"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_centerInParent="true"
+            android:gravity="center" 
+            android:visibility="gone"/>
+    </RelativeLayout>
+	<TextView 
+	    style="@style/umeng_socialize_divider"
+	    android:layout_alignParentBottom="true"/>
+</RelativeLayout>

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

@@ -760,7 +760,7 @@
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="android:divider">#00000000</item>
-        <item name="android:dividerHeight">10dp</item>
+        <item name="android:dividerHeight">5dp</item>
         <item name="android:scrollingCache">false</item>
         <item name="android:headerDividersEnabled">false</item>
         <item name="android:footerDividersEnabled">true</item>
@@ -768,6 +768,16 @@
         <item name="android:listSelector">@android:color/transparent</item>
     </style>
 
+    <!--通用PullToRefreshListView列表显示间隙style-->
+    <style name="general_Line_clearance">
+        <item name="android:divider">@drawable/bg_bar</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:dividerHeight">5dp</item>
+        <item name="android:scrollingCache">false</item>
+    </style>
+
     <style name="GridViewBasic">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>