订阅号优化

WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/MsgBroadcast.java

@@ -11,6 +11,7 @@ import com.xzjmyk.pm.activity.AppConfig;
  */
 public class MsgBroadcast {
 	public static final String ACTION_MSG_UI_UPDATE = AppConfig.sPackageName + ".action.msg_ui_update";// 界面的更新
+	public static final String ACTION_MSG_COMPANY_UPDATE = AppConfig.sPackageName + ".com.app.home.update";// 界面的更新
 	public static final String ACTION_MSG_NUM_UPDATE = AppConfig.sPackageName + ".intent.action.msg_num_update";// 未读数量的更新
 	public static final String ACTION_MSG_NUM_RESET = AppConfig.sPackageName + ".action.msg_num_reset";// 未读数量需要重置，即从数据库重新查
 	public static final String EXTRA_NUM_COUNT = "count";

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

@@ -18,8 +18,8 @@ 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,EMP_ID_,RN)";
+        String sql = "CREATE TABLE SubscriptionMessage(id_ PRIMARY KEY,num_id_,instance_id_ ,createdate_,title_," +
+                "son_title_,status_,EMP_ID_,RN_,SONTITLE_,SUMDATA_)";
         sqLiteDatabase.execSQL(sql);
     }
 

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

@@ -1,132 +1,163 @@
-//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;
-//    }
-//}
+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++) {
+                Log.i("bbbb", "进来自此");
+                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.getEMP_ID_());
+                values.put("RN_", message.getRN());
+                values.put("SONTITLE_", message.getSONTITLE_());
+                values.put("SUMDATA_", message.getSUMDATA_());
+
+                k += db.insert(titleName, nullColumn, values);
+                Log.i("bbbb", "进来自此" + k);
+
+            }
+            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();
+        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.getEMP_ID_());
+            values.put("RN_", message.getRN());
+            values.put("SONTITLE_", message.getSONTITLE_());
+            values.put("SUMDATA_", message.getSUMDATA_());
+            k += db.insert(titleName, nullColumn, values);
+
+        } catch (SQLException e) {
+            Log.i("gong", e.getMessage());
+            e.printStackTrace();
+        } finally {
+            db.close();
+        }
+        return k;
+    }
+
+    public long removeMessage(ArrayList<SubscriptionMessage> messages) {
+        long k = 0;
+        SQLiteDatabase db = sqliteHelper.getWritableDatabase();
+        db.beginTransaction();
+        try {
+            String where = "id_=?";
+            for (int i = 0; i < messages.size(); i++) {
+                String[] whereArg = {"" + messages.get(i).getID_()};
+                k += db.delete(titleName, where, whereArg);
+            }
+            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_", "title_", "son_title_", "status_", "EMP_ID_"
+                , "RN_", "SONTITLE_", "SUMDATA_"};
+        String selection = null;
+        String[] selectionArgs = null;
+        try {
+            SubscriptionMessage message = null;
+            Cursor values = db.query(titleName, colums, selection, selectionArgs, null, null, null);
+            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(4));
+                message.setSON_TITLE_(values.getString(5));
+                message.setSTATUS_(values.getInt(6));
+                message.setEMP_ID_(values.getInt(7));
+                message.setRN(values.getInt(8));
+                message.setSONTITLE_(values.getString(9));
+                message.setSUMDATA_(values.getString(10));
+                messages.add(message);
+            }
+
+        } catch (SQLException e) {
+            Log.i("gong", e.getMessage());
+        } finally {
+            db.close();
+        }
+        for (int i = 0; i < messages.size(); i++) {
+            Log.i("aaaaa", messages.get(i).getTITLE_());
+        }
+        return messages;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -34,16 +34,12 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
 import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
-import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.cardcast.AttentionFragment;
-import com.xzjmyk.pm.activity.ui.cardcast.FriendFragment;
-import com.xzjmyk.pm.activity.ui.cardcast.RoomFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.LinksManFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
@@ -52,7 +48,6 @@ import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
-import com.xzjmyk.pm.activity.ui.nearby.NearbyFragment;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -115,14 +110,10 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private Fragment mLastFragment;
     private MessageFragment mMessageFragment;
     private MyFriendFragment mMyFriendFragment;//我的朋友---相互关注，单项关注，房间
-    private NearbyFragment mNearbyFragment;//附近
     private WorksFragment mWorksFragment;//工作
     private GroupChatFragment mGroupChatFragment;//群聊
     private MeFragment mMeFragment;//我
     private LinksManFragment mBusinessCircleFragment;
-    private FriendFragment mFriend;// 互相关注
-    private AttentionFragment mAttention;// 单向关注
-    private RoomFragment mRoom;// 关注房间
     public static String BAIDU_PUSH = "BAIDUPUSH";
     private boolean mXmppBind;
     private CoreService mCoreService;
@@ -171,8 +162,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
     }
 
-
-
+    int oldERPNum = 0;
     /**
      * @desc:主页菜单入口
      * @author：Administrator on 2016/1/26 10:03
@@ -180,20 +170,23 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private DivideRadioGroup.OnCheckedChangeListener mTabRadioGroupChangeListener = new DivideRadioGroup.OnCheckedChangeListener() {
         @Override
         public void onCheckedChanged(DivideRadioGroup group, int checkedId) {
-            Log.i("RadioGroupChecked", "执行...");
-
             if (checkedId == R.id.main_tab_one) {
                 if (mMessageFragment == null) {
                     mMessageFragment = new MessageFragment();
                 }
+                mMessageFragment.setOnRefreshRedUI(new MessageFragment.OnRefreshUIListener() {
+                    @Override
+                    public void updata(int num) {
+                        //当首页有更新，mainactivity跟着更新页面
+                        mMsgUnReadNum = mMsgUnReadNum - oldERPNum > 0 ? (mMsgUnReadNum - oldERPNum) : 0;
+                        mMsgUnReadNum = mMsgUnReadNum + num;
+                        oldERPNum = num;
+                        updateMsgUnReadTv();
+                    }
+                });
                 changeFragment(mMessageFragment, TAG_MESSAGE);//消息
                 updateMessageTitle();
             } else if (checkedId == R.id.main_tab_two) {
-                /*if (mMyFriendFragment == null) {
-                    mMyFriendFragment = new MyFriendFragment();
-				}
-				changeFragment(mMyFriendFragment, TAG_MY);
-				getSupportActionBar().setTitle("通讯录");*/
                 if (mBusinessCircleFragment == null) {
                     mBusinessCircleFragment = new LinksManFragment();
                 }
@@ -386,22 +379,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             }
         }
     };
-    private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(CardcastUiUpdateUtil.ACTION_UPDATE_UI)) {
-                if (mAttention != null) {
-                    mAttention.update();
-                }
-                if (mFriend != null) {
-                    mFriend.update();
-                }
-                if (mRoom != null) {
-                    mRoom.update();
-                }
-            }
-        }
-    };
+
     private ServiceConnection mServiceConnection = new ServiceConnection() {
         @Override
         public void onServiceDisconnected(ComponentName name) {
@@ -473,7 +451,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 mUserCheckHander.sendEmptyMessageDelayed(MSG_USER_CHECK, mRetryCheckDelay);
             }
         }
-        registerReceiver(mUpdateReceiver, CardcastUiUpdateUtil.getUpdateActionFilter());
         mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
 
         screenListener = new ScreenListener(this);
@@ -493,9 +470,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 Log.d("wang", "MainActivity....解锁");
             }
         });
-
     }
-
     public void updateVersion() {
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
             @Override
@@ -719,12 +694,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private void initMsgUnReadTips(String userId) {// 初始化未读条数
         // 消息未读条数累加
         mMsgUnReadNum = FriendDao.getInstance().getMsgUnReadNumTotal(userId);
-        mUnReadHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                updateMsgUnReadTv();
-            }
-        });
+        updateMsgUnReadTv();
     }
 
     private void updateMsgUnReadTv() {

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,14 +40,12 @@ public class NoticeMenuActivity extends BaseActivity {
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                distribute(i, itemClick);
+                distribute((i - 1), itemClick);
             }
         });
         listView.setAdapter(new MAdapter());
     }
-
     private Bean bean = null;//临时的变量
-
     private void init() {
         Intent intent = getIntent();
         GONGGAO_count = intent.getIntExtra(GONGGAO, 0);
@@ -64,11 +63,13 @@ public class NoticeMenuActivity extends BaseActivity {
     private int itemClick = 0x00a, setData = 0xaab;
 
     public void distribute(int i, int type) {
+        Log.i("gongpengming", "i=" + i + ":::" + "type=" + type);
         switch (i) {
             case 0:
-                if (type == itemClick)
+                if (type == itemClick) {
                     startActivity(new Intent(NoticeMenuActivity.this, NewsTwoActivity.class).putExtra("type", 0));
-                else if (setData == type) {
+
+                } else if (setData == type) {
                     bean.unReNun = NES_count;
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条新闻未阅读";

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

@@ -1,17 +1,5 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
-import com.alibaba.fastjson.JSON;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.ui.MainActivity;
-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.StringUtils;
-import com.xzjmyk.pm.activity.R;
-
-import org.apache.http.cookie.Cookie;
-
-import com.handmark.pulltorefresh.library.PullToRefreshWebView;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -26,6 +14,15 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.handmark.pulltorefresh.library.PullToRefreshWebView;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+
+import org.apache.http.cookie.Cookie;
+
 /**
  * Created by Administrator on 2016/4/5.
  */
@@ -50,16 +47,17 @@ public class WebViewCommActivity extends BaseActivity {
         pb = (ProgressBar) findViewById(R.id.pb);
         pb.setMax(100);
         url = intent.getStringExtra("url");
-        String  StartApp = intent.getStringExtra("isStartApp");//参数账套
-        if(!StringUtils.isEmpty(StartApp)){
-            if(StartApp.equals("true")){
+        String StartApp = intent.getStringExtra("isStartApp");//参数账套
+        if (!StringUtils.isEmpty(StartApp)) {
+            if (StartApp.equals("true")) {
                 isStartApp = true;
             }
         }
         String p = "";//动态改变文字显示
         try {
             p = intent.getStringExtra("p");
-        } catch (Exception e) {}
+        } catch (Exception e) {
+        }
         if (p != null) {
             getSupportActionBar().setTitle(p);
         }
@@ -74,27 +72,27 @@ public class WebViewCommActivity extends BaseActivity {
         webView.getRefreshableView().getSettings().setAppCacheEnabled(true);
         if (MyApplication.cookie != null) {
             //synCookies(this, url);
-        }else{
-              clearCookie();
+        } else {
+            clearCookie();
         }
         webView.getRefreshableView().loadUrl(url);
         webView.getRefreshableView().setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 System.out.println("link url=" + url);
-                if (!url.equals("http://www.ubtob.com/signin#")){
+                if (!url.equals("http://www.ubtob.com/signin#")) {
                     if (MyApplication.cookie != null) {
-                       // synCookies(WebViewCommActivity.this, url);
+                        // synCookies(WebViewCommActivity.this, url);
                         view.loadUrl(url);
-                    }else{
+                    } else {
 //                        ViewUtil.ShowMessageTitleAutoDismiss(WebViewCommActivity.this,
 //                                "您的登录会话过期！请重新登录！",1000);
                         view.loadUrl(url);
                     }
-                }else{
+                } else {
                     if (MyApplication.cookie != null) {
-                       // synCookies(WebViewCommActivity.this, "http://www.ubtob.com/#");
+                        // synCookies(WebViewCommActivity.this, "http://www.ubtob.com/#");
                         view.loadUrl("http://www.ubtob.com/#");
-                    }else{
+                    } else {
                         view.loadUrl(url);
                     }
                 }
@@ -144,7 +142,7 @@ public class WebViewCommActivity extends BaseActivity {
         CookieSyncManager.getInstance().sync();
     }
 
-    public void clearCookie(){
+    public void clearCookie() {
         CookieManager cookieManager = CookieManager.getInstance();
         cookieManager.removeSessionCookie();//移除
         cookieManager.removeAllCookie();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -19,6 +19,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
@@ -117,7 +118,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                         CommonUtil.setSharedPreferences(ct, "Master_ch", master_ch);
                         master_tv.setText(master_ch);
                         // 发送给主页刷新的广播
-                        Intent intent = new Intent("com.app.home.update");
+                        Intent intent = new Intent(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE);
                         intent.putExtra("falg", "home");
                         LocalBroadcastManager.getInstance(ct).sendBroadcast(intent);
                     } else {

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

@@ -10,12 +10,12 @@ import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -42,7 +42,6 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.NoticeMenuActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ScheduleActivity;
@@ -86,6 +85,8 @@ public class MessageFragment extends EasyFragment {
     private NearlyMessageAdapter mAdapter;
     private Handler mHandler = new Handler();
     private boolean isRefeshed;
+    private MainActivity mActivity;
+
     //界面更新广播
     private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
         @Override
@@ -100,7 +101,6 @@ public class MessageFragment extends EasyFragment {
         }
     };
     //接收修改公司广播
-    private IntentFilter inputFilter;
     private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -109,7 +109,13 @@ public class MessageFragment extends EasyFragment {
             }
         }
     };
-    private BaseActivity mActivity;
+
+    public OnRefreshUIListener refreshRedUIListener = null;
+
+    public interface OnRefreshUIListener {
+        void updata(int num);
+    }
+
 
     public MessageFragment() {
         mOriginalFriendList = new ArrayList<BaseSortModel<Friend>>();
@@ -123,25 +129,18 @@ public class MessageFragment extends EasyFragment {
 
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        mActivity.registerReceiver(mUpdateReceiver, new IntentFilter(MsgBroadcast.ACTION_MSG_UI_UPDATE));
+        mActivity.registerReceiver(receiver, new IntentFilter(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE));
         if (createView) {
             initView();
         }
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        inputFilter = new IntentFilter();
-        inputFilter.addAction("com.app.home.update");
-        getActivity().registerReceiver(mUpdateReceiver, new IntentFilter(MsgBroadcast.ACTION_MSG_UI_UPDATE));
-        getActivity().registerReceiver(receiver, inputFilter);
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
-        getActivity().unregisterReceiver(mUpdateReceiver);
-        getActivity().unregisterReceiver(receiver);
+        mActivity.unregisterReceiver(mUpdateReceiver);
+        mActivity.unregisterReceiver(receiver);
     }
 
     @Override
@@ -158,6 +157,15 @@ public class MessageFragment extends EasyFragment {
         }, 100);
     }
 
+    public void setOnRefreshRedUI(OnRefreshUIListener refreshRedUI) {
+        this.refreshRedUIListener = refreshRedUI;
+    }
+
+    public void setListener(int num) {
+        if (refreshRedUIListener == null) return;
+        refreshRedUIListener.updata(num);
+    }
+
     private void initView() {
 
         mClearEditText = (ClearEditText) findViewById(R.id.search_edit);
@@ -193,7 +201,7 @@ public class MessageFragment extends EasyFragment {
         mPullToRefreshListView = (PullToRefreshSlideListView) findViewById(R.id.pull_refresh_list);
         mPullToRefreshListView.setShowIndicator(false);
         mPullToRefreshListView.setMode(Mode.PULL_FROM_START);
-        mAdapter = new NearlyMessageAdapter(getActivity());
+        mAdapter = new NearlyMessageAdapter(mActivity);
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
 
         mPullToRefreshListView.setOnRefreshListener(new OnRefreshListener<SlideListView>() {
@@ -209,14 +217,14 @@ public class MessageFragment extends EasyFragment {
                 Friend friend = (Friend) arg0.getItemAtPosition(position);
                 if (friend.getRoomFlag() == 0) {
                     if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友消息
-                        startActivity(new Intent(getActivity(), NewFriendActivity.class));
+                        startActivity(new Intent(mActivity, NewFriendActivity.class));
                     } else {
-                        Intent intent = new Intent(getActivity(), ChatActivity.class);
+                        Intent intent = new Intent(mActivity, ChatActivity.class);
                         intent.putExtra(ChatActivity.FRIEND, friend);
                         startActivity(intent);
                     }
                 } else {
-                    Intent intent = new Intent(getActivity(), MucChatActivity.class);
+                    Intent intent = new Intent(mActivity, MucChatActivity.class);
                     intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
                     intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getNickName());
                     intent.putExtra(AppConstant.EXTRA_IS_GROUP_CHAT, true);
@@ -224,7 +232,7 @@ public class MessageFragment extends EasyFragment {
                 }
 
                 if (friend.getUnReadNum() > 0) {
-                    MsgBroadcast.broadcastMsgNumUpdate(getActivity(), false, friend.getUnReadNum());
+                    MsgBroadcast.broadcastMsgNumUpdate(mActivity, false, friend.getUnReadNum());
                     friend.setUnReadNum(0);
                     mAdapter.notifyDataSetChanged();
                 }
@@ -242,10 +250,9 @@ public class MessageFragment extends EasyFragment {
     private TextView task_num_tv, task_content_tv, task_time_tv;
     private TextView notice_num_tv, notice_content_tv, notice_time_tv;
     private TextView num_tv, content_tv, time_tv;
-    private RelativeLayout schedule_rl, task_rl, _rl, notice_rl;
 
     private View getHeaderView() {
-        View view = LayoutInflater.from(getActivity()).inflate(R.layout.message_header, null);
+        View view = LayoutInflater.from(mActivity).inflate(R.layout.message_header, null);
         schedule_num_tv = (TextView) view.findViewById(R.id.schedule_num_tv);
         schedule_content_tv = (TextView) view.findViewById(R.id.schedule_content_tv);
         schedule_time_tv = (TextView) view.findViewById(R.id.schedule_time_tv);
@@ -274,20 +281,20 @@ public class MessageFragment extends EasyFragment {
         public void onClick(View view) {
             switch (view.getId()) {
                 case R.id.schedule_rl:
-                    startActivity(new Intent(getActivity(), ScheduleActivity.class));
+                    startActivity(new Intent(mActivity, ScheduleActivity.class));
                     break;
                 case R.id.task_rl:
-                    startActivity(new Intent(getActivity(), TaskActivity.class));
+                    startActivity(new Intent(mActivity, TaskActivity.class));
                     break;
                 case R.id.notice_rl:
-                    Intent intent = new Intent(getActivity(), NoticeMenuActivity.class);
+                    Intent intent = new Intent(mActivity, NoticeMenuActivity.class);
                     intent.putExtra(NoticeMenuActivity.GONGGAO, GONGGAO_count);
                     intent.putExtra(NoticeMenuActivity.NOTICE, NOTICE_count);
                     intent.putExtra(NoticeMenuActivity.NES, NES_count);
                     startActivity(intent);
                     break;
                 case R.id._rl:
-                    startActivity(new Intent(getActivity(), SubscriptionActivity.class));
+                    startActivity(new Intent(mActivity, SubscriptionActivity.class));
                     break;
             }
         }
@@ -300,10 +307,10 @@ public class MessageFragment extends EasyFragment {
         FriendDao.getInstance().markUserMessageRead(
                 MyApplication.getInstance().mLoginUser.getUserId(),
                 Friend.ID_ERP_ZHIHUI);
-        loadERPMsgNum(getActivity());
-        loadGongGaoCount(getActivity());
-        loadNoticeCount(getActivity());
-        loadERPNewsNum(getActivity());
+        loadERPMsgNum(mActivity);
+        loadGongGaoCount(mActivity);
+        loadNoticeCount(mActivity);
+        loadERPNewsNum(mActivity);
     }
 
 
@@ -338,10 +345,11 @@ public class MessageFragment extends EasyFragment {
         mActivity.addDefaultRequest(request);
     }
 
+
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mActivity = (BaseActivity) getActivity();
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mActivity = (MainActivity) context;
     }
 
     public void setFriendName(List<Friend> friends, String id) {
@@ -426,7 +434,7 @@ public class MessageFragment extends EasyFragment {
     private void deleteFriend(final String loginUserId, final BaseSortModel<Friend> sortFriend) {
         Friend friend = sortFriend.getBean();
         if (friend.getUnReadNum() > 0) {
-            MsgBroadcast.broadcastMsgNumUpdate(getActivity(), false, friend.getUnReadNum());
+            MsgBroadcast.broadcastMsgNumUpdate(mActivity, false, friend.getUnReadNum());
         }
         mFriendList.remove(sortFriend);
         mOriginalFriendList.remove(sortFriend);
@@ -436,15 +444,14 @@ public class MessageFragment extends EasyFragment {
         FriendDao.getInstance().deleteFriend(loginUserId, friend.getUserId());
         // 消息表中删除
         ChatMessageDao.getInstance().deleteMessageTable(loginUserId, friend.getUserId());
-
-        MainActivity activity = (MainActivity) getActivity();
-        activity.exitMucChat(friend.getUserId());
+        mActivity.exitMucChat(friend.getUserId());
 
     }
 
+    //先忽略
     public void sendBroadcast() {
         Intent mIntent = new Intent(MucgroupUpdateUtil.ACTION_UPDATE);
-        getActivity().sendBroadcast(mIntent);
+        mActivity.sendBroadcast(mIntent);
     }
 
 
@@ -475,9 +482,9 @@ public class MessageFragment extends EasyFragment {
                 convertView = createConvertView(position);
             }
             if (position % 2 == 0) {
-                convertView.setBackgroundColor(getActivity().getResources().getColor(R.color.item_color1));
+                convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color1));
             } else {
-                convertView.setBackgroundColor(getActivity().getResources().getColor(R.color.item_color2));
+                convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
             }
             ImageView avatar_img = ViewHolder.get(convertView, R.id.avatar_img);
             TextView num_tv = ViewHolder.get(convertView, R.id.num_tv);
@@ -504,12 +511,11 @@ public class MessageFragment extends EasyFragment {
                 if (TextUtils.isEmpty(friend.getRoomCreateUserId())) {
                     avatar_img.setImageResource(R.drawable.qunliao);
                 } else {
-                    if (position >= 3)
                         AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), avatar_img, false);// 目前在备注名放房间的创建者Id
                 }
             }
             nick_name_tv.setText(friend.getRemarkName() != null ? friend.getRemarkName() : friend.getNickName());
-            time_tv.setText(TimeUtils.getFriendlyTimeDesc(getActivity(), friend.getTimeSend()));
+            time_tv.setText(TimeUtils.getFriendlyTimeDesc(mActivity, friend.getTimeSend()));
 
             CharSequence content = "";
             if (friend.getType() == XmppMessage.TYPE_TEXT) {
@@ -534,7 +540,7 @@ public class MessageFragment extends EasyFragment {
                     String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
                     if (friend.getRoomFlag() == 0) {
                         if (friend.getUnReadNum() > 0) {
-                            MsgBroadcast.broadcastMsgNumUpdate(getActivity(), false, friend.getUnReadNum());
+                            MsgBroadcast.broadcastMsgNumUpdate(mActivity, false, friend.getUnReadNum());
                         }
                         BaseSortModel<Friend> mode = mFriendList.get(position);
 
@@ -650,6 +656,7 @@ public class MessageFragment extends EasyFragment {
                     updateNews(msg);
                     break;
 
+                //以下为更新页面
                 case GONGGAO_MSG:
                     setNOTICE_count(GONGGAO_count + NOTICE_count + NES_count);
                     break;
@@ -660,6 +667,7 @@ public class MessageFragment extends EasyFragment {
                     setNOTICE_count(GONGGAO_count + NOTICE_count + NES_count);
                     break;
                 case TASK_MSG:
+                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
                     if (TASK_count > 0) {
                         task_num_tv.setText(TASK_count + "");
                         task_num_tv.setVisibility(View.VISIBLE);
@@ -671,6 +679,7 @@ public class MessageFragment extends EasyFragment {
                     }
                     break;
                 case DAIBAN_MSG:
+                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
                     if (DAIBAN_count > 0) {
                         schedule_num_tv.setText(DAIBAN_count + "");
                         schedule_num_tv.setVisibility(View.VISIBLE);
@@ -682,6 +691,7 @@ public class MessageFragment extends EasyFragment {
                     }
                     break;
                 case SUBRICE_MSG:
+                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
                     if (SUBRICE_count > 0) {
                         num_tv.setText(SUBRICE_count + "");
                         num_tv.setVisibility(View.VISIBLE);
@@ -698,6 +708,7 @@ public class MessageFragment extends EasyFragment {
     };
 
     private void setNOTICE_count(int count) {
+        setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         if (count > 0) {
             notice_num_tv.setText(count + "");
             notice_num_tv.setVisibility(View.VISIBLE);
@@ -709,7 +720,7 @@ public class MessageFragment extends EasyFragment {
         }
     }
 
-    private final int GONGGAO_MSG = 0X00a, NOTICE_MSG = 0X00b, NES_MSG = 0X00c, TASK_MSG = 0X00d, DAIBAN_MSG = 0X00e, SUBRICE_MSG = 0xf;
+    public static final int GONGGAO_MSG = 0X00a, NOTICE_MSG = 0X00b, NES_MSG = 0X00c, TASK_MSG = 0X00d, DAIBAN_MSG = 0X00e, SUBRICE_MSG = 0xf;
     private int GONGGAO_count = 0, NOTICE_count = 0, NES_count = 0, TASK_count = 0, DAIBAN_count = 0, SUBRICE_count = 0;
 
     private void updateGongGao(Message msg) {
@@ -723,7 +734,7 @@ public class MessageFragment extends EasyFragment {
                 if (newsEntity != null) {
                     size = newsEntity.getData().size();
                 }
-                String em_id = CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
+                String em_id = CommonUtil.getSharedPreferences(mActivity, "erp_emid");
                 int count = 0;
                 for (int i = 0; i < size; i++) {
                     if (!ObjectUtils.isEquals(newsEntity.getData().get(i).getSTATUS(), null)) {
@@ -765,7 +776,7 @@ public class MessageFragment extends EasyFragment {
                     size = newsEntity.getData().size();
                 }
                 count = 0;
-                em_id = CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
+                em_id = CommonUtil.getSharedPreferences(mActivity, "erp_emid");
                 for (int i = 0; i < size; i++) {
                     if (!ObjectUtils.isEquals(newsEntity.getData().get(i).getSTATUS(), null)) {
                         if (((int) newsEntity.getData().get(i).getSTATUS()) != -1) {

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

@@ -1,5 +1,7 @@
 package com.xzjmyk.pm.activity.ui.message;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -20,6 +22,7 @@ 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;
@@ -38,13 +41,17 @@ import java.util.Map;
 
 
 public class SubscriptionActivity extends BaseActivity {
-    private String baseUrl = "http://218.17.158.219:8090/ERP//";
+    private String baseUrl;
     private PullToRefreshListView listView;
     private ArrayList<SubscriptionMessage> SubscriptionMessages;
     private SubscriptionAdapter adapter;
     private SubscriptionActivity activity = this;
     private ArrayList<SortSubsrciprion> sortSubsrciprions;
-    private int date = 20160612;
+    private int date = -1;
+    private int[] srcs = {
+            R.drawable.dingyue, R.drawable.list_01, R.drawable.list_02, R.drawable.list_03
+    };
+
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -62,7 +69,10 @@ public class SubscriptionActivity extends BaseActivity {
             } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
                 //错误信息
             }
+
+
         }
+
     };
 
     @Override//设置右划退出
@@ -74,17 +84,22 @@ public class SubscriptionActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscription);
+        baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
+        adapter = new SubscriptionAdapter();
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
             @Override
             public void onRefresh(PullToRefreshBase<ListView> refreshView) {
-                cancelData();
-                initData(date);
+                setData();
+                Log.i("gongpengming", "刷新");
             }
         });
         initData(date);
+//        SubscriptionMessages = findDataFromDB();
+//        setData();
     }
 
+
     private void cancelData() {
         if (sortSubsrciprions != null) {
             SubscriptionMessages.clear();
@@ -94,11 +109,10 @@ public class SubscriptionActivity extends BaseActivity {
         }
     }
 
-
     private void setData() {
-
         if (SubscriptionMessages == null || SubscriptionMessages.size() <= 0) return;
-        saveDataToDB();
+        clearDataToDB();
+        saveDataToDB(SubscriptionMessages);
         sortSubsrciprions = new ArrayList<>();
         SortSubsrciprion sortSubsrciprion = null;
         for (int i = 0; i < SubscriptionMessages.size(); i++) {
@@ -122,29 +136,38 @@ public class SubscriptionActivity extends BaseActivity {
                 sortSubsrciprions.add(sortSubsrciprion);
             }
         }
-        for (int i = 0; i < sortSubsrciprions.size(); i++) {
-            for (int j = 0; j < sortSubsrciprions.get(i).beans.size(); j++)
-                Log.i("ggggg", sortSubsrciprions.get(i).beans.get(j).getSONTITLE_() == null ? "aa" : sortSubsrciprions.get(i).beans.get(j).getSONTITLE_());
-        }
-        adapter = new SubscriptionAdapter();
         listView.setAdapter(adapter);
-        adapter.notifyDataSetChanged();
+//        listView.setAdapter(adapter);
+
         if (listView.isRefreshing()) {
-            listView.setRefreshing(false);
-        }
+            Log.i("gongpengming", "正在刷新");
+
+        } else
+            Log.i("gongpengming", "meizshuaxin");
+        listView.onRefreshComplete();
+
     }
 
-    private void saveDataToDB() {
+    private void clearDataToDB() {
+        //Todo  chear the db
+    }
 
+    private void saveDataToDB(ArrayList<SubscriptionMessage> subscriptionMessages) {
+        // add message to db
+//        long k = SubscriptionDao.getInstance().addMessage(subscriptionMessages);
     }
 
+    private ArrayList<SubscriptionMessage> findDataFromDB() {
+        return SubscriptionDao.getInstance().findAll();
+    }
 
     public void initData(int date) {
         String url = baseUrl + "common/desktop/subs/getSubs.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("count", 100);
-//        param.put("condition", "where to_char(createdate_,'yyyymmdd')='20160612'");
-        param.put("condition", "where 1=1");
+        if (date == -1) param.put("condition", "where 1=1");
+        else param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + date + "'");
+
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
@@ -168,7 +191,6 @@ public class SubscriptionActivity extends BaseActivity {
             return position;
         }
 
-
         @Override
         public View getView(final int position, View contextView, ViewGroup viewGroup) {
             Viewholder viewholder = null;
@@ -194,6 +216,7 @@ public class SubscriptionActivity extends BaseActivity {
                     ViewUtil.WebLinks(activity, url, "订阅");
                 }
             });
+
             return contextView;
         }
 
@@ -202,7 +225,17 @@ public class SubscriptionActivity extends BaseActivity {
             MyListView listview;
             ListAdapter adapter;
         }
+    }
 
+    private void popWindou() {
+        new AlertDialog.Builder(mContext).setTitle(R.string.app_name).setMessage(R.string.delete_item).setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        //TODo 删除内容   操作数据库
+
+                    }
+                }).create().show();
 
     }
 
@@ -263,12 +296,14 @@ public class SubscriptionActivity extends BaseActivity {
                 holder.big_tv.setText(beans.get(i).getTITLE_());
                 holder.big_isre_tv.setText(beans.get(i).getSTATUS_() == 0 ? "未读" : "已读");
                 holder.big_sub_title_tv.setText(chcheStr);
+                holder.big_img.setImageDrawable(getResources().getDrawable(srcs[i]));
             } else {
                 holder.ll.setVisibility(View.VISIBLE);
                 holder.rl.setVisibility(View.GONE);
                 holder.small_tv.setText(beans.get(i).getTITLE_());
                 holder.sub_title_tv.setText(chcheStr);
                 holder.isre_tv.setText(beans.get(i).getSTATUS_() == 0 ? "未读" : "已读");
+                holder.small_img.setImageDrawable(getResources().getDrawable(srcs[i]));
             }
             return contextView;
         }

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

@@ -7,12 +7,12 @@
     android:layout_height="match_parent"
     android:layout_above="@+id/bottom_view"
     android:scrollbars="none"
-    android:divider="#00000000"
-    ptr:ptrAnimationStyle="flip"
+    android:divider="#00000000" />
+<!--    ptr:ptrAnimationStyle="flip"
     ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
     ptr:ptrDrawableStart="@drawable/default_ptr_flip"
     ptr:ptrHeaderTextColor="@color/black"
-    ptr:ptrMode="both"
     ptr:ptrOverScroll="false"
-    ptr:ptrScrollingWhileRefreshingEnabled="true"
-    ptr:ptrShowIndicator="false" />
+
+    ptr:ptrShowIndicator="false"-->
+    <!--ptr:ptrMode="both"-->

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

@@ -47,11 +47,12 @@
 
         <ImageView
             android:id="@+id/small_img"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="5dp"
+            android:background="@color/background"
             android:src="@drawable/list_01" />
     </RelativeLayout>
 

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

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@drawable/bg_main"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_main">
 
-     <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:layout_below="@+id/tv_dispaly_top"
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/listview_schedult"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_below="@+id/tv_dispaly_top"
         android:divider="@null"
-        android:listSelector="#00000000"
         android:fadingEdge="none"
-        android:scrollbars="none" >
-    </com.handmark.pulltorefresh.library.PullToRefreshListView>
+        android:listSelector="#00000000"
+        android:scrollbars="none"></com.handmark.pulltorefresh.library.PullToRefreshListView>
 </RelativeLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="delete_item">确定要删除吗</string>
+
+
+</resources>

materialdialogs/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java

@@ -65,8 +65,6 @@ public class DialogUtils {
         }
     }
 
-    // Get the specified color resource, creating a ColorStateList if the resource
-    // points to a color value.
     public static ColorStateList getActionTextColorStateList(Context context, @ColorRes int colorId) {
         final TypedValue value = new TypedValue();
         context.getResources().getValue(colorId, value, true);