Browse Source

移动语音搜索框

Bitliker 8 years ago
parent
commit
3eba274fad
77 changed files with 81 additions and 341 deletions
  1. 1 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/SearchFriendActivity.java
  2. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java
  3. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/MyFriendActivity.java
  4. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DataInquiryListActivity.java
  6. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindList2Activity.java
  7. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindListActivity.java
  8. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TaskActivity.java
  9. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/contanct/ContactsActivity.java
  10. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java
  11. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessSelectCustomerActivity.java
  12. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java
  13. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListSelectActivity.java
  14. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java
  15. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessB2BActivity.java
  16. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java
  17. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DestinationActivity.java
  18. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetingActivity.java
  19. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatDailyShowActivity.java
  20. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SearchSelectActivity.java
  21. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectActivity.java
  22. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java
  23. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectCollisionActivity.java
  24. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectDepartmentActivity.java
  25. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.java
  26. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java
  27. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsActivity.java
  28. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/UUFriendFragment.java
  29. 0 92
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/VoiceSearchView.java
  30. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/CreateGroupActivity.java
  31. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java
  32. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
  33. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectActivity.java
  34. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/LeavePageActivity.java
  35. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/TravelPageActivity.java
  36. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/WorkPageActivity.java
  37. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java
  38. 0 162
      WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ClearEditText.java
  39. 1 1
      WeiChat/src/main/res/layout/act_list_dbfind_employee.xml
  40. 1 1
      WeiChat/src/main/res/layout/act_sale_select_list.xml
  41. 1 1
      WeiChat/src/main/res/layout/act_staff_query_list.xml
  42. 2 2
      WeiChat/src/main/res/layout/action_data_inquiry_list.xml
  43. 1 1
      WeiChat/src/main/res/layout/activity_basic_info_edit.xml
  44. 1 1
      WeiChat/src/main/res/layout/activity_business_qiang_activty.xml
  45. 1 1
      WeiChat/src/main/res/layout/activity_business_select_customer.xml
  46. 1 1
      WeiChat/src/main/res/layout/activity_contacts.xml
  47. 1 1
      WeiChat/src/main/res/layout/activity_customer_list_select.xml
  48. 1 1
      WeiChat/src/main/res/layout/activity_destination.xml
  49. 2 2
      WeiChat/src/main/res/layout/activity_login.xml
  50. 1 1
      WeiChat/src/main/res/layout/activity_login_history.xml
  51. 1 1
      WeiChat/src/main/res/layout/activity_map_location.xml
  52. 1 1
      WeiChat/src/main/res/layout/activity_meet_select.xml
  53. 1 1
      WeiChat/src/main/res/layout/activity_meeting.xml
  54. 1 1
      WeiChat/src/main/res/layout/activity_process_msg.xml
  55. 2 2
      WeiChat/src/main/res/layout/activity_register.xml
  56. 2 2
      WeiChat/src/main/res/layout/activity_register_password.xml
  57. 1 1
      WeiChat/src/main/res/layout/activity_register_user_basic_info.xml
  58. 1 1
      WeiChat/src/main/res/layout/activity_search_location.xml
  59. 1 1
      WeiChat/src/main/res/layout/activity_search_select.xml
  60. 1 1
      WeiChat/src/main/res/layout/activity_select.xml
  61. 1 1
      WeiChat/src/main/res/layout/activity_select_active.xml
  62. 1 1
      WeiChat/src/main/res/layout/activity_select_aim.xml
  63. 1 1
      WeiChat/src/main/res/layout/activity_select_department.xml
  64. 1 1
      WeiChat/src/main/res/layout/activity_select_remark.xml
  65. 2 3
      WeiChat/src/main/res/layout/activity_user_search.xml
  66. 1 1
      WeiChat/src/main/res/layout/activity_work_daily.xml
  67. 2 2
      WeiChat/src/main/res/layout/dialog_create_muc_room.xml
  68. 1 1
      WeiChat/src/main/res/layout/fragment_contact_friend.xml
  69. 1 1
      WeiChat/src/main/res/layout/fragment_message.xml
  70. 1 1
      WeiChat/src/main/res/layout/fragment_new_message.xml
  71. 1 1
      WeiChat/src/main/res/layout/header_fragment_contact.xml
  72. 1 1
      WeiChat/src/main/res/layout/seach_include.xml
  73. 1 1
      WeiChat/src/main/res/layout/search_header.xml
  74. 1 1
      WeiChat/src/main/res/layout/task_listview.xml
  75. 1 2
      app_core/common/src/main/java/com/core/model/EmployeesEntity.java
  76. 2 1
      app_core/common/src/main/java/com/core/widget/ClearEditText.java
  77. 0 2
      app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java

+ 1 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/SearchFriendActivity.java

@@ -27,7 +27,6 @@ package com.xzjmyk.pm.activity.ui.cardcast;//package com.xzjmyk.pm.activity.ui.c
 //import com.sk.im.ui.circle.PersonalInfoActivity;
 //import com.sk.im.util.ToastUtil;
 //import com.sk.im.util.Utils;
-//import com.sk.im.view.ClearEditText;
 //import com.sk.im.view.TopNormalBar;
 //import com.sk.im.volley.ArrayResult;
 //import com.sk.im.volley.FastVolley;
@@ -43,7 +42,6 @@ package com.xzjmyk.pm.activity.ui.cardcast;//package com.xzjmyk.pm.activity.ui.c
 //	private final int mPageSize = 20;
 //
 //	private TopNormalBar mTopTitleBar;
-//	private ClearEditText mSearchEdit;
 //	private Button mSearchBtn;
 //	private PullToRefreshListView mPullToRefreshListView;
 //	private TextView mNoResultTv;
@@ -66,7 +64,7 @@ package com.xzjmyk.pm.activity.ui.cardcast;//package com.xzjmyk.pm.activity.ui.c
 //
 //	private void initView() {
 //		initTopTitleBar();
-//		mSearchEdit = (ClearEditText) findViewById(R.id.search_edit);
+//
 //		mSearchBtn = (Button) findViewById(R.id.search_btn);
 //
 //		mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -57,7 +57,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.common.thread.ThreadPool;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/MyFriendActivity.java

@@ -42,7 +42,7 @@ import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.core.utils.ToastUtil;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -55,7 +55,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DataInquiryListActivity.java

@@ -7,7 +7,7 @@ import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 
 /**
  * Created by RaoMeng on 2017/8/3.

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

@@ -35,7 +35,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindListActivity.java

@@ -40,7 +40,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -49,7 +49,7 @@ import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 
 import java.util.ArrayList;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/contanct/ContactsActivity.java

@@ -58,7 +58,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.contacts.Contacts;
 import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java

@@ -41,7 +41,7 @@ import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessSelectCustomerActivity.java

@@ -39,7 +39,7 @@ import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java

@@ -39,7 +39,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.steps.HorizontalStepsView;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListSelectActivity.java

@@ -34,7 +34,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java

@@ -50,7 +50,7 @@ import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 
 import java.util.ArrayList;
 import java.util.Calendar;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessB2BActivity.java

@@ -39,7 +39,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.ComplaintDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.core.api.wxapi.ApiConfig;

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

@@ -40,7 +40,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.setting.ComApprovalUtil;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DestinationActivity.java

@@ -39,7 +39,7 @@ import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.text.DecimalFormat;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetingActivity.java

@@ -31,7 +31,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatDailyShowActivity.java

@@ -32,7 +32,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.utils.TimeUtils;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SearchSelectActivity.java

@@ -28,7 +28,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.utils.ToastUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectActivity.java

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;

+ 1 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java

@@ -23,7 +23,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 
 import java.util.ArrayList;
@@ -33,7 +33,6 @@ import java.util.List;
 public class SelectAimActivity extends OABaseActivity implements ISelectAim {
 
 //    @ViewInject(R.id.search_edit)
-//    private ClearEditText search_edit;
     @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
     @ViewInject(R.id.mapView)

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectCollisionActivity.java

@@ -25,7 +25,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.SelectCollisionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.OAConfig;
 
 import java.util.List;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectDepartmentActivity.java

@@ -35,7 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.view.tree.MyTreeListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.Node;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.TreeListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.bean.HrorgsModel;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.java

@@ -38,7 +38,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
 import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 
 import org.json.JSONArray;
 import org.json.JSONException;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsActivity.java

@@ -32,7 +32,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.OAConfig;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/UUFriendFragment.java

@@ -40,7 +40,7 @@ import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;

+ 0 - 92
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/VoiceSearchView.java

@@ -1,92 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.view;
-
-import android.content.Context;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.RelativeLayout;
-
-import com.iflytek.cloud.RecognizerResult;
-import com.iflytek.cloud.SpeechConstant;
-import com.iflytek.cloud.SpeechError;
-import com.iflytek.cloud.ui.RecognizerDialog;
-import com.iflytek.cloud.ui.RecognizerDialogListener;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
-
-/**
- * Created by Bitliker on 2017/5/15.
- */
-
-public class VoiceSearchView extends RelativeLayout {
-    private ClearEditText search_edit;
-
-    public VoiceSearchView(Context context) {
-        this(context, null);
-    }
-
-    public VoiceSearchView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public VoiceSearchView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        LayoutInflater.from(context).inflate(R.layout.seach_include, this);
-        search_edit = (ClearEditText) findViewById(R.id.search_edit);
-        findViewById(R.id.voice_search_iv).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                btnVoice();
-            }
-        });
-    }
-
-    public void setHineText(String hine) {
-        search_edit.setHint(hine);
-    }
-    public void setText(String hine) {
-        search_edit.setText(hine);
-    }
-
-    public Editable getText(){
-        return search_edit.getText();
-    }
-
-    private void btnVoice() {
-        RecognizerDialog dialog = new RecognizerDialog(getContext(), null);
-        dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
-        dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
-        dialog.setListener(new RecognizerDialogListener() {
-            @Override
-            public void onResult(RecognizerResult recognizerResult, boolean b) {
-                String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-                search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
-
-            }
-
-            @Override
-            public void onError(SpeechError speechError) {
-
-            }
-        });
-        dialog.show();
-
-    }
-
-
-    public void addTextChangedListener(TextWatcher watcher) {
-        search_edit.addTextChangedListener(watcher);
-    }
-
-    public ClearEditText getSearch_edit() {
-        return search_edit;
-    }
-
-    public void setSearch_edit(ClearEditText search_edit) {
-        this.search_edit = search_edit;
-    }
-}

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/CreateGroupActivity.java

@@ -35,7 +35,7 @@ import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.xzjmyk.pm.activity.view.HorizontalListView;
 
 import java.util.ArrayList;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java

@@ -58,7 +58,7 @@ import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.util.imageloader.BitmapUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.xzjmyk.pm.activity.view.HorizontalListView;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;

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

@@ -40,7 +40,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskB2BActivity;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.view.DrawableCenterTextView;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectActivity.java

@@ -24,7 +24,7 @@ import com.core.xmpp.model.MucRoom;
 import com.core.xmpp.model.MucRoomMember;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.core.widget.ClearEditText;
 import com.core.net.volley.FastVolley;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/LeavePageActivity.java

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.adapter.PagesModelAdapter;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/TravelPageActivity.java

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.adapter.PagesModelAdapter;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/WorkPageActivity.java

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.adapter.PagesModelAdapter;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -47,7 +47,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.widget.VoiceSearchView;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;
 

+ 0 - 162
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ClearEditText.java

@@ -1,162 +0,0 @@
-package com.xzjmyk.pm.activity.view;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v7.widget.AppCompatEditText;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnFocusChangeListener;
-import android.view.animation.Animation;
-import android.view.animation.CycleInterpolator;
-import android.view.animation.TranslateAnimation;
-
-import com.xzjmyk.pm.activity.R;
-
-public class ClearEditText extends AppCompatEditText implements OnFocusChangeListener, TextWatcher {
-	/**
-	 * 删除按钮的引用
-	 */
-	private Drawable mClearDrawable;
-	private boolean mFocusClear = false;
-
-	public ClearEditText(Context context) {
-		this(context, null);
-	}
-
-	public ClearEditText(Context context, AttributeSet attrs) {
-		this(context, attrs, android.R.attr.editTextStyle);
-	}
-
-	public ClearEditText(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		init();
-	}
-
-	private void init() {
-		// 获取EditText的DrawableRight,假如没有设置我们就使用默认的图片
-		mClearDrawable = getCompoundDrawables()[2];
-		if (mClearDrawable == null) {
-			mClearDrawable = getResources().getDrawable(R.drawable.search_clear);
-		}
-		mClearDrawable.setBounds(0, 0, mClearDrawable.getIntrinsicWidth(), mClearDrawable.getIntrinsicHeight());
-		setClearIconVisible(false);
-		setOnFocusChangeListener(this);
-		addTextChangedListener(this);
-	}
-
-	/**
-	 * 因为我们不能直接给EditText设置点击事件,所以我们用记住我们按下的位置来模拟点击事件 当我们按下的位置 在 EditText的宽度 - 图标到控件右边的间距 - 图标的宽度 和 EditText的宽度 - 图标到控件右边的间距之间我们就算点击了图标,竖直方向没有考虑
-	 */
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		int action = MotionEventCompat.getActionMasked(event);
-		if (action == MotionEvent.ACTION_DOWN) {
-			if (!TextUtils.isEmpty(getError())) {
-				setError(null, null);
-				setClearIconVisible(getText().length() > 0);
-				return false;
-			}
-		}
-
-		if (getCompoundDrawables()[2] != null) {
-			if (event.getAction() == MotionEvent.ACTION_UP) {
-				boolean touchable = event.getX() > (getWidth() - getPaddingRight() - mClearDrawable.getIntrinsicWidth())
-						&& (event.getX() < ((getWidth() - getPaddingRight())));
-				if (touchable) {
-					this.setText("");
-				}
-			}
-		}
-
-		return super.onTouchEvent(event);
-	}
-
-	/**
-	 * 当ClearEditText焦点发生变化的时候,判断里面字符串长度设置清除图标的显示与隐藏
-	 */
-	@Override
-	public void onFocusChange(View v, boolean hasFocus) {
-		if (mFocusClear) {
-			if (hasFocus) {
-				setClearIconVisible(getText().length() > 0);
-			} else {
-				setClearIconVisible(false);
-			}
-		}
-	}
-
-	/**
-	 * 当焦点改变的时候,显示或者隐藏Clear icon
-	 */
-	public void setFocusClear(boolean focusClear) {
-		mFocusClear = focusClear;
-	}
-
-	/**
-	 * 设置清除图标的显示与隐藏,调用setCompoundDrawables为EditText绘制上去
-	 * 
-	 * @param visible
-	 */
-	protected void setClearIconVisible(boolean visible) {
-		if (visible) {
-			if (!TextUtils.isEmpty(getError())) {
-				setError(null);
-			}
-		}
-		if (visible) {
-			if (mFocusClear && !hasFocus()) {
-				visible = false;
-			}
-		}
-		Drawable right = visible ? mClearDrawable : null;
-		if (getCompoundDrawables()[2] != right) {
-			setCompoundDrawables(getCompoundDrawables()[0], getCompoundDrawables()[1], null, getCompoundDrawables()[3]);
-		}
-		setCompoundDrawables(getCompoundDrawables()[0], getCompoundDrawables()[1], right, getCompoundDrawables()[3]);
-	}
-
-	/**
-	 * 当输入框里面内容发生变化的时候回调的方法
-	 */
-	@Override
-	public void onTextChanged(CharSequence s, int start, int count, int after) {
-		setClearIconVisible(s.length() > 0);
-	}
-
-	@Override
-	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-	}
-
-	@Override
-	public void afterTextChanged(Editable s) {
-
-	}
-
-	/**
-	 * 设置晃动动画
-	 */
-	public void setShakeAnimation() {
-		this.setAnimation(shakeAnimation(5));
-	}
-
-	/**
-	 * 晃动动画
-	 * 
-	 * @param counts
-	 *            1秒钟晃动多少下
-	 * @return
-	 */
-	public static Animation shakeAnimation(int counts) {
-		Animation translateAnimation = new TranslateAnimation(0, 10, 0, 0);
-		translateAnimation.setInterpolator(new CycleInterpolator(counts));
-		translateAnimation.setDuration(1000);
-		return translateAnimation;
-	}
-
-}

+ 1 - 1
WeiChat/src/main/res/layout/act_list_dbfind_employee.xml

@@ -22,7 +22,7 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true" >
 
-                <com.xzjmyk.pm.activity.view.ClearEditText
+                <com.core.widget.ClearEditText
                     android:id="@+id/et_Search"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"

+ 1 - 1
WeiChat/src/main/res/layout/act_sale_select_list.xml

@@ -6,7 +6,7 @@
     android:background="@drawable/bg_main"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/act_staff_query_list.xml

@@ -6,7 +6,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 2 - 2
WeiChat/src/main/res/layout/action_data_inquiry_list.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+<com.core.widget.VoiceSearchView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/data_inquiry_searchview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-</com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView>
+</com.core.widget.VoiceSearchView>

+ 1 - 1
WeiChat/src/main/res/layout/activity_basic_info_edit.xml

@@ -38,7 +38,7 @@
                     android:drawablePadding="5dp"
                     android:text="@string/name_align" />
 
-                <com.xzjmyk.pm.activity.view.ClearEditText
+                <com.core.widget.ClearEditText
                     android:id="@+id/name_edit"
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/name_arrow_img"

+ 1 - 1
WeiChat/src/main/res/layout/activity_business_qiang_activty.xml

@@ -12,7 +12,7 @@
         style="@style/app_line_horizontal_05p"
         android:layout_width="match_parent"></View>
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_business_select_customer.xml

@@ -17,7 +17,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"

+ 1 - 1
WeiChat/src/main/res/layout/activity_contacts.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.contanct.ContactsActivity">
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_customer_list_select.xml

@@ -7,7 +7,7 @@
     android:background="@drawable/bg_bar"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.CustomerListSelectActivity">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_destination.xml

@@ -22,7 +22,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 2 - 2
WeiChat/src/main/res/layout/activity_login.xml

@@ -42,7 +42,7 @@
                     android:paddingLeft="10dp"
                     android:text="@string/login_account" />
                 <!--   android:drawableLeft="@drawable/login_user_name"-->
-                <com.xzjmyk.pm.activity.view.ClearEditText
+                <com.core.widget.ClearEditText
                     android:id="@+id/phone_numer_edit"
                     style="@style/IMLineEditText"
                     android:background="@color/white"
@@ -72,7 +72,7 @@
                     android:paddingLeft="10dp"
                     android:text="@string/login_password" />
                 <!--    android:drawableLeft="@drawable/loginpw"-->
-                <com.xzjmyk.pm.activity.view.ClearEditText
+                <com.core.widget.ClearEditText
                     android:id="@+id/password_edit"
                     style="@style/IMLineEditPass"
                     android:background="@color/white"

+ 1 - 1
WeiChat/src/main/res/layout/activity_login_history.xml

@@ -48,7 +48,7 @@
                 android:contentDescription="@string/app_name"
                 android:src="@drawable/account_icon" />
 
-            <com.xzjmyk.pm.activity.view.ClearEditText
+            <com.core.widget.ClearEditText
                 android:id="@+id/password_edit"
                 style="@style/IMLineEditPass"
                 android:layout_width="fill_parent"

+ 1 - 1
WeiChat/src/main/res/layout/activity_map_location.xml

@@ -17,7 +17,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 1 - 1
WeiChat/src/main/res/layout/activity_meet_select.xml

@@ -17,7 +17,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 1 - 1
WeiChat/src/main/res/layout/activity_meeting.xml

@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetingActivity">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_process_msg.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 2 - 2
WeiChat/src/main/res/layout/activity_register.xml

@@ -4,7 +4,7 @@
     android:background="@color/normal_bg"
     android:orientation="vertical" >
 
-    <com.xzjmyk.pm.activity.view.ClearEditText
+    <com.core.widget.ClearEditText
         android:id="@+id/phone_numer_edit"
         style="@style/IMLineEditText"
         android:layout_marginLeft="9dp"
@@ -22,7 +22,7 @@
         android:paddingLeft="9dp"
         android:paddingRight="9dp" >
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/auth_code_edit"
             style="@style/IMLineEditText"
             android:layout_centerVertical="true"

+ 2 - 2
WeiChat/src/main/res/layout/activity_register_password.xml

@@ -4,7 +4,7 @@
     android:background="@color/normal_bg"
     android:orientation="vertical" >
 
-    <com.xzjmyk.pm.activity.view.ClearEditText
+    <com.core.widget.ClearEditText
         android:id="@+id/password_edit"
         style="@style/IMLineEditPass"
         android:layout_marginLeft="9dp"
@@ -13,7 +13,7 @@
         android:background="@drawable/set_list_up"
         android:hint="@string/please_input_password" />
 
-    <com.xzjmyk.pm.activity.view.ClearEditText
+    <com.core.widget.ClearEditText
         android:id="@+id/confirm_password_edit"
         style="@style/IMLineEditPass"
         android:layout_marginLeft="9dp"

+ 1 - 1
WeiChat/src/main/res/layout/activity_register_user_basic_info.xml

@@ -38,7 +38,7 @@
                     android:drawablePadding="5dp"
                     android:text="@string/name_align" />
 
-                <com.xzjmyk.pm.activity.view.ClearEditText
+                <com.core.widget.ClearEditText
                     android:id="@+id/name_edit"
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/name_arrow_img"

+ 1 - 1
WeiChat/src/main/res/layout/activity_search_location.xml

@@ -19,7 +19,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 1 - 1
WeiChat/src/main/res/layout/activity_search_select.xml

@@ -6,7 +6,7 @@
     android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchSelectActivity">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_select.xml

@@ -8,7 +8,7 @@
     android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.message.SelectActivity">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_select_active.xml

@@ -3,7 +3,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/bg_main">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_select_aim.xml

@@ -6,7 +6,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/activity_select_department.xml

@@ -16,7 +16,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"

+ 1 - 1
WeiChat/src/main/res/layout/activity_select_remark.xml

@@ -17,7 +17,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

+ 2 - 3
WeiChat/src/main/res/layout/activity_user_search.xml

@@ -50,7 +50,6 @@
             </RelativeLayout>
 
 
-            <!--<ClearEditText-->
             <!--android:id="@+id/keyword_edit"-->
             <!--android:layout_width="250dp"-->
             <!--android:layout_height="40dp"-->
@@ -124,7 +123,7 @@
                 android:text="@string/user_minage"
                 android:textSize="15sp"/>
 
-            <com.xzjmyk.pm.activity.view.ClearEditText
+            <com.core.widget.ClearEditText
                 android:id="@+id/min_age_edit"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/min_age_arrow_img"
@@ -162,7 +161,7 @@
                 android:text="@string/user_maxage"
                 android:textSize="15sp" />
 
-            <com.xzjmyk.pm.activity.view.ClearEditText
+            <com.core.widget.ClearEditText
                 android:id="@+id/max_age_edit"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/max_age_arrow_img"

+ 1 - 1
WeiChat/src/main/res/layout/activity_work_daily.xml

@@ -6,7 +6,7 @@
     android:background="@drawable/bg_main"
     >
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 2 - 2
WeiChat/src/main/res/layout/dialog_create_muc_room.xml

@@ -21,7 +21,7 @@
             android:text="@string/room_name"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/room_name_edit"
             android:layout_width="match_parent"
             android:layout_height="40dp"
@@ -57,7 +57,7 @@
 
             />
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/room_desc_edit"
             android:layout_width="match_parent"
             android:layout_height="40dp"

+ 1 - 1
WeiChat/src/main/res/layout/fragment_contact_friend.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_main">
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/fragment_message.xml

@@ -15,7 +15,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"

+ 1 - 1
WeiChat/src/main/res/layout/fragment_new_message.xml

@@ -6,7 +6,7 @@
     android:orientation="vertical" >
 
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/header_fragment_contact.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 1
WeiChat/src/main/res/layout/seach_include.xml

@@ -8,7 +8,7 @@
     android:paddingRight="15dp"
     android:paddingTop="5dp">
 
-    <com.xzjmyk.pm.activity.view.ClearEditText
+    <com.core.widget.ClearEditText
         android:id="@+id/search_edit"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

+ 1 - 1
WeiChat/src/main/res/layout/search_header.xml

@@ -10,7 +10,7 @@
     android:paddingRight="15dp"
     android:paddingTop="5dp">
 
-    <com.xzjmyk.pm.activity.view.ClearEditText
+    <com.core.widget.ClearEditText
         android:id="@+id/search_edit"
         android:layout_width="match_parent"
         android:layout_height="35dp"

+ 1 - 1
WeiChat/src/main/res/layout/task_listview.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"
     android:orientation="vertical">
-    <com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView
+    <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />

+ 1 - 2
app_core/common/src/main/java/com/core/model/EmployeesEntity.java

@@ -2,9 +2,8 @@ package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-
+import com.common.R;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 
 public class EmployeesEntity implements Parcelable {
 

+ 2 - 1
app_core/common/src/main/java/com/core/widget/ClearEditText.java

@@ -15,7 +15,8 @@ import android.view.animation.Animation;
 import android.view.animation.CycleInterpolator;
 import android.view.animation.TranslateAnimation;
 
-import com.xzjmyk.pm.activity.R;
+import com.common.R;
+
 
 public class ClearEditText extends AppCompatEditText implements OnFocusChangeListener, TextWatcher {
 	/**

+ 0 - 2
app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java

@@ -39,8 +39,6 @@ import java.util.Map;
  * Created by Bitliker on 2017/8/30.
  */
 public class ContactsManager implements OnHttpResultListener {
-
-
     private final int LOAD_COMPANY_WHAT = 1;