|
|
@@ -12,6 +12,7 @@ import android.os.Message;
|
|
|
import android.support.annotation.NonNull;
|
|
|
import android.support.annotation.Nullable;
|
|
|
import android.text.Editable;
|
|
|
+import android.text.TextUtils;
|
|
|
import android.view.View;
|
|
|
import android.widget.AdapterView;
|
|
|
import android.widget.CheckBox;
|
|
|
@@ -340,7 +341,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
models.addAll(allModels);
|
|
|
adapter.notifyDataSetChanged();
|
|
|
} else {
|
|
|
- LogUtil.i("start for=" +System.currentTimeMillis());
|
|
|
+ LogUtil.i("start for=" + System.currentTimeMillis());
|
|
|
List<ContactsModel> keyWorkModels = new ArrayList<>();
|
|
|
for (ContactsModel e : allModels) {
|
|
|
if (includeKeyWork(e, searchKey)) {
|
|
|
@@ -356,7 +357,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- LogUtil.i("end for=" +System.currentTimeMillis());
|
|
|
+ LogUtil.i("end for=" + System.currentTimeMillis());
|
|
|
updateAdapter(keyWorkModels);
|
|
|
}
|
|
|
}
|
|
|
@@ -379,7 +380,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
} else {
|
|
|
this.models.clear();
|
|
|
this.models.addAll(models);
|
|
|
- Collections.sort(this.models,getComparator());
|
|
|
+ Collections.sort(this.models, getComparator());
|
|
|
adapter.notifyDataSetChanged();
|
|
|
if (models.size() == 0) {
|
|
|
emptyLayout.showEmpty();
|
|
|
@@ -401,6 +402,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
}
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 点击后
|
|
|
*
|
|
|
@@ -598,7 +600,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
if (adapter != null) {
|
|
|
models.clear();
|
|
|
models.addAll(lists);
|
|
|
- Collections.sort(models,getComparator());
|
|
|
+ Collections.sort(models, getComparator());
|
|
|
adapter.notifyDataSetChanged();
|
|
|
if (adapter.getCount() == 0) emptyLayout.showEmpty();
|
|
|
mlist.onRefreshComplete();
|
|
|
@@ -958,34 +960,38 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
|
|
|
public void handleMessage(Message msg) {
|
|
|
switch (msg.what) {
|
|
|
case 0x01:
|
|
|
- try {
|
|
|
- String result = msg.getData().getString("result");
|
|
|
- String root = JSON.parseObject(result).getString("result");
|
|
|
- JSONArray array = JSON.parseArray(root);
|
|
|
- List<ContactsModel> xmodels = new ArrayList<>();
|
|
|
- for (int i = 0; i < array.size(); i++) {
|
|
|
- ContactsModel model = new ContactsModel();
|
|
|
- model.setType(2);
|
|
|
- model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
|
|
|
- model.setImid(array.getJSONObject(i).getString("imid"));
|
|
|
- model.setName(array.getJSONObject(i).getString("nickname"));
|
|
|
- model.setPhone(array.getJSONObject(i).getString("telephone"));
|
|
|
- xmodels.add(model);
|
|
|
- }
|
|
|
- if (!ListUtils.isEmpty(models)) {
|
|
|
- models.clear();
|
|
|
- models.addAll(xmodels);
|
|
|
- } else {
|
|
|
- models.addAll(xmodels);
|
|
|
- }
|
|
|
- if (adapter != null) {
|
|
|
- adapter.notifyDataSetChanged();
|
|
|
- }
|
|
|
- if (adapter.getCount() == 0) {
|
|
|
- emptyLayout.showEmpty();
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
+ if (TextUtils.isEmpty(voiceSearchView.getText())) {
|
|
|
+ updateAdapter(allModels);
|
|
|
+ } else {
|
|
|
+ try {
|
|
|
+ String result = msg.getData().getString("result");
|
|
|
+ String root = JSON.parseObject(result).getString("result");
|
|
|
+ JSONArray array = JSON.parseArray(root);
|
|
|
+ List<ContactsModel> xmodels = new ArrayList<>();
|
|
|
+ for (int i = 0; i < array.size(); i++) {
|
|
|
+ ContactsModel model = new ContactsModel();
|
|
|
+ model.setType(2);
|
|
|
+ model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
|
|
|
+ model.setImid(array.getJSONObject(i).getString("imid"));
|
|
|
+ model.setName(array.getJSONObject(i).getString("nickname"));
|
|
|
+ model.setPhone(array.getJSONObject(i).getString("telephone"));
|
|
|
+ xmodels.add(model);
|
|
|
+ }
|
|
|
+ if (!ListUtils.isEmpty(models)) {
|
|
|
+ models.clear();
|
|
|
+ models.addAll(xmodels);
|
|
|
+ } else {
|
|
|
+ models.addAll(xmodels);
|
|
|
+ }
|
|
|
+ if (adapter != null) {
|
|
|
+ adapter.notifyDataSetChanged();
|
|
|
+ }
|
|
|
+ if (adapter.getCount() == 0) {
|
|
|
+ emptyLayout.showEmpty();
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
}
|