|
|
@@ -423,12 +423,8 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
ThreadPool.getThreadPool().addTask(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
- LogUtil.d("Test", "isHasPermiss:" + isHasPermiss);
|
|
|
if (isHasPermiss) {
|
|
|
- List<Contacts> contacts =
|
|
|
- ContactsUtils.getContacts1();
|
|
|
- //上传数据到服务器
|
|
|
- uploadData(contacts);
|
|
|
+ List<Contacts> contacts = ContactsUtils.getContacts1();
|
|
|
if (contacts != null) {
|
|
|
for (Contacts entity : contacts) {
|
|
|
ContactsModel model = new ContactsModel();
|
|
|
@@ -459,27 +455,21 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
|
|
|
/**
|
|
|
* @desc:加载通讯录数据
|
|
|
- * @author:Arison on 2017/7/19
|
|
|
*/
|
|
|
public void getCaceData(final boolean isHasNet) {
|
|
|
-
|
|
|
ThreadPool.getThreadPool().addTask(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
final List<ContactsModel> lists = getLocalContactsByDB();
|
|
|
-// List<ContactsModel> contacts=new ArrayList<>();
|
|
|
-// for (ContactsModel model:lists){
|
|
|
-// if ("0".equals(model.getImid())){
|
|
|
-// contacts.add(model);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// uploadData(contacts);
|
|
|
-
|
|
|
- LogUtil.d("Test", "!ListUtils.isEmpty(lists)=" + !ListUtils.isEmpty(lists));
|
|
|
+ List<ContactsModel> contacts=new ArrayList<>();
|
|
|
+ for (ContactsModel model:lists){
|
|
|
+ if ("0".equals(model.getImid())||StringUtil.isEmpty(model.getImid())){
|
|
|
+ contacts.add(model);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ uploadData(contacts);
|
|
|
boolean falg = !ListUtils.isEmpty(lists) && !isHasNet;
|
|
|
- LogUtil.d("Test", "缓存不为空!" + falg);
|
|
|
if (falg) {
|
|
|
- LogUtil.d("Test", "缓存不为空!");
|
|
|
getStateByPhones(lists);
|
|
|
OAHttpHelper.getInstance().post(new Runnable() {
|
|
|
@Override
|
|
|
@@ -881,7 +871,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
|
|
|
|
|
|
//
|
|
|
- public void uploadData(List<Contacts> models) {
|
|
|
+ public void uploadData(List<ContactsModel> models) {
|
|
|
if (!ListUtils.isEmpty(models)) {
|
|
|
StringBuilder mapBuilder = new StringBuilder("[");
|
|
|
for (int i = 0; i < models.size(); i++) {
|