Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_fanglh

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -33,7 +33,6 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.PermissionUtil;
-import com.common.system.SystemUtil;
 import com.common.thread.ThreadPool;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -50,6 +49,7 @@ import com.core.model.User;
 import com.core.model.XmppMessage;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
+import com.core.net.utils.NetUtils;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
@@ -174,7 +174,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                 ThreadPool.getThreadPool().addTask(new Runnable() {
                     @Override
                     public void run() {
-                        if (SystemUtil.isNetWorkConnected(MyApplication.getInstance())) {
+                        if (NetUtils.isNetWorkConnected(MyApplication.getInstance())) {
                             if (!ListUtils.isEmpty(tmodels)) {
                                 tmodels.clear();
                             }
@@ -233,10 +233,19 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                 LogUtil.d("arison", " searchKey:" + searchKey);
                 if (!StringUtil.isEmpty(s.toString())) {
                     mlist.setMode(PullToRefreshBase.Mode.DISABLED);
-                    List<ContactsModel> cacheData = contactsDao.find(s.toString());
+                    //contactsDao.find(s.toString());
+                    List<ContactsModel> cacheData =contactsDao.find(s.toString()) ;
+                    if (!ListUtils.isEmpty(stateModels)){
+                        for (int i = 0; i <cacheData.size() ; i++) {
+                            for (int j = 0; j <stateModels.size(); j++) {
+                                if (cacheData.get(i).getImid().equals(stateModels.get(j).getImid())){
+                                    cacheData.get(i).setClick(stateModels.get(j).isClick);
+                                }
+                            }
+                        }
+                    }
                     if (adapter != null) {
                         if (ListUtils.isEmpty(cacheData)) {
-                            LogUtil.d("arison", "searchContactsByNet:" + searchKey);
                             searchContactsByNet(s.toString());
                             return;
                         }