Просмотр исходного кода

Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v2.0

# Conflicts:
#	WeiChat/build.gradle
#	app_core/common/src/main/res/layout/seach_include.xml
SpringBoots 8 лет назад
Родитель
Сommit
41a133b75e
100 измененных файлов с 766 добавлено и 769 удалено
  1. 1 1
      WeiChat/build.gradle
  2. 1 1
      WeiChat/src/main/java/com/ipaulpro/afilechooser/FileReceiverActivity.java
  3. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java
  4. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionAdapter.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionNumbersAdapter.java
  6. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java
  7. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java
  8. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/NewFriendAdapter.java
  9. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PersonalQzoneAdapter.java
  10. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java
  11. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/AllSubscriptonKindMessage.java
  12. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectEmUser.java
  13. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/CircleMessageDao.java
  14. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/MyPhotoDao.java
  15. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/NewFriendDao.java
  16. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  17. 6 6
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java
  18. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/AttentionFragment.java
  19. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/FriendFragment.java
  20. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/RoomFragment.java
  21. 1 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/SearchFriendActivity.java
  22. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java
  23. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java
  24. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleFragment.java
  25. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PMsgDetailActivity.java
  26. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PersonalQzoneActivity.java
  27. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java
  28. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgDetailHeaderView.java
  29. 562 561
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgVideoHeaderView.java
  30. 4 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java
  31. 8 8
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/MyFriendActivity.java
  32. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/BaseInfoActivity.java
  33. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java
  34. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyActivity.java
  35. 6 6
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java
  36. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DataInquiryListActivity.java
  37. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindList2Activity.java
  38. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DbfindListActivity.java
  39. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/InformActivity.java
  40. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ManageAllSubscriptionActivity.java
  41. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NewsTwoActivity.java
  42. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NoticesActivity.java
  43. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ScheduleActivity.java
  44. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TaskActivity.java
  45. 6 6
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/contanct/ContactsActivity.java
  46. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/AddBusinessActivity.java
  47. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java
  48. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessSelectCustomerActivity.java
  49. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java
  50. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java
  51. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListSelectActivity.java
  52. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java
  53. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java
  54. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessB2BActivity.java
  55. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java
  56. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddContactsActivity.java
  57. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java
  58. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ChangeMobileActivity.java
  59. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java
  60. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DestinationActivity.java
  61. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java
  62. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetingActivity.java
  63. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java
  64. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java
  65. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatDailyShowActivity.java
  66. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatWDdetailyActivity.java
  67. 4 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SearchSelectActivity.java
  68. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectActivity.java
  69. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java
  70. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectCollisionActivity.java
  71. 6 6
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectDepartmentActivity.java
  72. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectRemarkActivity.java
  73. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/TeamsAttShowActivity.java
  74. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.java
  75. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java
  76. 4 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java
  77. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsActivity.java
  78. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsPresenter.java
  79. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/setting/ComApprovalUtil.java
  80. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/AllRemovedSubsAdapter.java
  81. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/AllRemovedSubsItemAdapter.java
  82. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java
  83. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendancesFragment.java
  84. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java
  85. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionMyFragment.java
  86. 5 5
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/UUFriendFragment.java
  87. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/HttpUtil.java
  88. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java
  89. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddVisitReportPresenter.java
  90. 5 5
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java
  91. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/FlightsPresernter.java
  92. 5 5
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MessagePresenter.java
  93. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java
  94. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/OAPresenter.java
  95. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java
  96. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectCollisionPresenter.java
  97. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SubscriptionPresenter.java
  98. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java
  99. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenterhi.java
  100. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ApprovaNodeUtil.java

+ 1 - 1
WeiChat/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     compile project(':imageload')
   //  compile project(':applogin')
 //    compile project(':message')
-    
+    compile project(':appcontact')
  
 }
 

+ 1 - 1
WeiChat/src/main/java/com/ipaulpro/afilechooser/FileReceiverActivity.java

@@ -15,7 +15,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.core.xmpp.model.ChatMessage;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.message.InstantMessageActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -11,8 +11,8 @@ import android.view.MenuItem;
 import com.andreabaccega.widget.FormEditText;
 import com.common.data.DateFormatUtil;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionAdapter.java

@@ -16,8 +16,8 @@ import android.widget.TextView;
 
 import com.common.ui.ImageUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.model.SubscriptionNumber;
+import com.core.dao.DBManager;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionNumbersAdapter.java

@@ -12,7 +12,7 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java

@@ -13,7 +13,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.core.utils.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.common.data.ListUtils;
 
 import java.util.List;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java

@@ -17,8 +17,8 @@ import android.widget.TextView;
 import com.common.ui.ImageUtil;
 import com.common.system.DisplayUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.model.PersonalSubscriptionBean;
+import com.core.dao.DBManager;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/NewFriendAdapter.java

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 
 import java.util.List;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PersonalQzoneAdapter.java

@@ -37,7 +37,7 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.core.base.BaseActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -38,7 +38,7 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.core.base.BaseActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/AllSubscriptonKindMessage.java

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.bean.message;
 
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.core.model.SubscriptionNumber;
 
 import java.util.List;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectEmUser.java

@@ -4,7 +4,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.common.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.model.EmployeesEntity;
 
 /**
  * 通用选择员工和选择部门通用实体类

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/CircleMessageDao.java

@@ -4,6 +4,7 @@ import android.os.Handler;
 import android.text.TextUtils;
 
 import com.common.thread.ThreadManager;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.Dao;

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/MyPhotoDao.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.db.dao;
 
 import android.os.Handler;
 
+import com.core.xmpp.listener.OnCompleteListener;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/NewFriendDao.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.db.dao;
 
+import com.core.xmpp.dao.FriendDao;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.Dao.CreateOrUpdateStatus;

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

@@ -66,7 +66,7 @@ import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
@@ -91,7 +91,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
-import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
+import com.core.xmpp.listener.AuthStateListener;
 import com.xzjmyk.pm.newpedo.service.StepService;
 import com.xzjmyk.pm.newpedo.utils.StepCountCheckUtil;
 

+ 6 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -22,19 +22,19 @@ import com.core.model.AttentionUser;
 import com.core.model.MyPhoto;
 import com.core.model.User;
 import com.core.model.CircleMessage;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
+import com.core.xmpp.model.MucRoom;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.core.dao.UserDao;
 import com.core.utils.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.model.HrorgsEntity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;

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

@@ -30,7 +30,7 @@ import com.core.model.Friend;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/FriendFragment.java

@@ -33,8 +33,8 @@ import com.core.model.Friend;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/RoomFragment.java

@@ -24,8 +24,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.ChatMessageDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;

+ 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);

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -55,7 +55,7 @@ import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
@@ -77,7 +77,7 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
-import com.xzjmyk.pm.activity.xmpp.listener.NewFriendListener;
+import com.core.xmpp.listener.NewFriendListener;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -48,7 +48,7 @@ import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleFragment.java

@@ -45,7 +45,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.core.utils.ToastUtil;
 import com.core.net.volley.ObjectResult;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PMsgDetailActivity.java

@@ -30,7 +30,7 @@ import com.core.model.Friend;
 import com.core.model.User;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PersonalQzoneActivity.java

@@ -47,13 +47,13 @@ import com.core.model.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.core.utils.ToastUtil;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java

@@ -53,7 +53,7 @@ import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
@@ -70,7 +70,7 @@ import com.core.net.volley.StringJsonArrayRequest;
 import com.core.net.volley.StringJsonObjectRequest;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
-import com.xzjmyk.pm.activity.xmpp.listener.NewFriendListener;
+import com.core.xmpp.listener.NewFriendListener;
 
 import java.util.HashMap;
 import java.util.List;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgDetailHeaderView.java

@@ -27,7 +27,7 @@ import com.core.model.Friend;
 import com.core.model.User;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.core.utils.TimeUtils;

+ 562 - 561
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgVideoHeaderView.java

@@ -40,565 +40,566 @@ import java.util.Formatter;
 import java.util.Locale;
 
 public class PMsgVideoHeaderView extends PMsgTypeView implements OnPreparedListener, OnCompletionListener, OnErrorListener, OnInfoListener,
-		OnPlayingBufferCacheListener, OnSeekCompleteListener {
-
-	private FrameLayout mPlayFrame;
-	private FrameLayout mVideoFrame;
-	private ImageView mThumbImg;
-	private BVideoView mBVideoView;
-	private LinearLayout mCacheProgressLayout;
-	private TextView mCacheProgressTv;
-	private MediaControlView mMediaControlView;
-
-	private StringBuilder mFormatBuilder;
-	private Formatter mFormatter;
-
-	private PublicMessage mPublicMessage;
-
-	public PMsgVideoHeaderView(Context context) {
-		super(context);
-		init();
-	}
-
-	public PMsgVideoHeaderView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		init();
-	}
-
-	@SuppressLint("NewApi")
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	public PMsgVideoHeaderView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		init();
-	}
-
-	private void init() {
-		LayoutInflater.from(getContext()).inflate(R.layout.header_view_p_msg_video, this);
-		setPortraitMode();
-		mPlayFrame = (FrameLayout) findViewById(R.id.play_frame);
-		mVideoFrame = (FrameLayout) findViewById(R.id.video_frame);
-		mThumbImg = (ImageView) findViewById(R.id.thumb_img);
-		mBVideoView = (BVideoView) findViewById(R.id.video_view);
-		mCacheProgressLayout = (LinearLayout) findViewById(R.id.cache_progress_layout);
-		mCacheProgressTv = (TextView) findViewById(R.id.cache_progress_tv);
-		mMediaControlView = (MediaControlView) findViewById(R.id.media_control_view);
-
-		mFormatBuilder = new StringBuilder();
-		mFormatter = new Formatter(mFormatBuilder, Locale.getDefault());
-		initVideoControl();
-	}
-
-	@SuppressWarnings("deprecation")
-	public void setLandscapeMode() {
-		int screenwidth = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getWidth();
-		int screenheight = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getHeight();
-		setLayoutParams(new AbsListView.LayoutParams(screenwidth, screenheight));
-	}
-
-	public void setPortraitMode() {// 设置动态高度为255dp
-		setLayoutParams(new AbsListView.LayoutParams(AbsListView.LayoutParams.MATCH_PARENT, getResources().getDimensionPixelSize(
-				R.dimen.pmsg_media_view_height)));
-	}
-
-	@Override
-	protected void onLayout(boolean changed, int l, int t, int r, int b) {
-		super.onLayout(changed, l, t, r, b);
-		if (changed) {
-			measureVideoSize();
-		}
-	}
-
-	private void measureVideoSize() {
-		if (mBVideoView != null && mPlayerStatus == PLAYER_STATUS.PLAYER_PREPARED) {
-			int width = mBVideoView.getVideoWidth();
-			int height = mBVideoView.getVideoHeight();
-			if (width != 0 && height != 0) {
-				int maxWidth = mVideoFrame.getWidth();
-				int maxHeight = mVideoFrame.getHeight();
-				float widthScale = maxWidth / ((float) width);
-				float heightScale = maxHeight / ((float) height);
-				float scale = widthScale > heightScale ? heightScale : widthScale;
-				int actualWidth = (int) (scale * width);
-				int actualHeight = (int) (scale * height);
-				FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(actualWidth, actualHeight);
-				params.gravity = Gravity.CENTER;
-				mBVideoView.setLayoutParams(params);
-			}
-
-		}
-	}
-
-	/**
-	 * 时间显示的工具方法
-	 */
-	private String stringForTime(int timeMs) {
-		// timeMs=timeMs/1000; 百度播放器的时间单位就是秒,系统的VideoView是毫秒
-		int seconds = timeMs % 60;
-		int minutes = (timeMs / 60) % 60;
-		int hours = timeMs / 3600;
-
-		mFormatBuilder.setLength(0);
-		if (hours > 0) {
-			return mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
-		} else {
-			return mFormatter.format("%02d:%02d", minutes, seconds).toString();
-		}
-	}
-
-	private String mVideoSource;
-
-	public void attachPublicMessage(PublicMessage publicMessage) {
-		mPublicMessage = publicMessage;
-
-		// mBVideoView.setVideoPath(publicMessage.getBody().getVideos());
-		mVideoSource = mPublicMessage.getFirstVideo();
-		// mVideoSource =
-		// "http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8";
-		String imageUrl = publicMessage.getFirstImageOriginal();
-		if (!TextUtils.isEmpty(imageUrl)) {
-			ImageLoader.getInstance().displayImage(imageUrl, mThumbImg);
-		} else {
-			AvatarHelper.getInstance().displayAvatar(publicMessage.getUserId(), mThumbImg, false);
-		}
-
-		mEventHandler.sendEmptyMessage(EVENT_PLAY);
-	}
-
-	/** VideoView的控制 */
-
-	private EventHandler mEventHandler;
-	private HandlerThread mHandlerThread;
-	private final Object SYNC_Playing = new Object();
-	private int mLastPos = 0;// 记录播放位置
-	private PLAYER_STATUS mPlayerStatus = PLAYER_STATUS.PLAYER_IDLE;// 当前播放状态
-
-	/**
-	 * 播放状态
-	 */
-	private enum PLAYER_STATUS {
-		PLAYER_IDLE, PLAYER_PREPARING, PLAYER_PREPARED,
-	}
-
-	private static final int EVENT_PLAY = 0;
-
-	class EventHandler extends Handler {
-		public EventHandler(Looper looper) {
-			super(looper);
-		}
-
-		@Override
-		public void handleMessage(Message msg) {
-			switch (msg.what) {
-			case EVENT_PLAY:
-				if (mPlayerStatus != PLAYER_STATUS.PLAYER_IDLE) {// 如果已经播放了,等待上一次播放结束
-					synchronized (SYNC_Playing) {
-						try {
-							SYNC_Playing.wait();
-						} catch (InterruptedException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-				mHandler.post(new Runnable() {
-					@Override
-					public void run() {
-						mPlayFrame.setVisibility(GONE);
-						mCacheProgressTv.setText("");
-						mCacheProgressLayout.setVisibility(VISIBLE);
-					}
-				});
-				mBVideoView.setVideoPath(mVideoSource);// 设置播放url
-				if (mLastPos > 0) {// 续播,如果需要如此
-					mBVideoView.seekTo(mLastPos);
-					mLastPos = 0;
-				}
-				mBVideoView.start();// 开始播放
-				mPlayerStatus = PLAYER_STATUS.PLAYER_PREPARING;
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	private View.OnClickListener mMediaControlViewVisibilityListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View v) {
-			if (isControllerShowing()) {
-				hide();
-			} else {
-				show();
-			}
-		}
-	};
-
-	private boolean isControllerShowing() {
-		return mMediaControlView.getVisibility() == VISIBLE;
-	}
-
-	private boolean mDragging = false;// 是否正在拖动进度条
-
-	/**
-	 * Show the controller on screen. It will go away automatically after 3 seconds of inactivity.
-	 */
-	public void show() {
-		show(sDefaultTimeout);
-	}
-
-	/**
-	 * Show the controller on screen. It will go away automatically after 'timeout' milliseconds of inactivity.
-	 * 
-	 * @param timeout
-	 *            The timeout in milliseconds. Use 0 to show the controller until hide() is called.
-	 */
-	public void show(int timeout) {
-		mMediaControlView.setVisibility(VISIBLE);
-		setProgress();
-		mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
-
-		// cause the progress bar to be updated even if mShowing
-		// was already true. This happens, for example, if we're
-		// paused with the progress bar showing the user hits play.
-		mHandler.sendEmptyMessage(SHOW_PROGRESS);
-
-		Message msg = mHandler.obtainMessage(FADE_OUT);
-		if (timeout != 0) {
-			mHandler.removeMessages(FADE_OUT);
-			mHandler.sendMessageDelayed(msg, timeout);
-		}
-	}
-
-	/**
-	 * Remove the controller from the screen.
-	 */
-	public void hide() {
-		if (isControllerShowing()) {
-			mHandler.removeMessages(SHOW_PROGRESS);
-			mMediaControlView.setVisibility(GONE);
-		}
-	}
-
-	private static final int FADE_OUT = 1;
-	private static final int SHOW_PROGRESS = 2;
-
-	private Handler mHandler = new Handler() {
-		@Override
-		public void handleMessage(Message msg) {
-			int pos;
-			switch (msg.what) {
-			case FADE_OUT:
-				hide();
-				break;
-			case SHOW_PROGRESS:
-				pos = setProgress();
-				if (!mDragging && mBVideoView.isPlaying()) {
-					msg = obtainMessage(SHOW_PROGRESS);
-					sendMessageDelayed(msg, 1000 - (pos % 1000));
-				}
-				break;
-			}
-		}
-	};
-
-	private int setProgress() {
-		if (mBVideoView == null || mDragging) {
-			return 0;
-		}
-		int position = mBVideoView.getCurrentPosition();
-		int duration = mBVideoView.getDuration();
-		if (duration > 0) {
-			// use long to avoid overflow
-			long pos = 1000L * position / duration;
-			mMediaControlView.setProgress((int) pos);
-		}
-		mMediaControlView.setTotalTime(stringForTime(duration));
-		mMediaControlView.setPastTime(stringForTime(position));
-
-		return position;
-	}
-
-	private void doPauseResume() {
-		if (mPlayerStatus != PLAYER_STATUS.PLAYER_PREPARED) {
-			mEventHandler.sendEmptyMessage(EVENT_PLAY);
-		} else {
-			if (mBVideoView.isPlaying()) {
-				mBVideoView.pause();
-			} else {
-				mBVideoView.resume();
-			}
-		}
-		mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
-	}
-
-	private static final int sDefaultTimeout = 8000;
-
-	private String AK = "z7Z1hMWvmXcDg4rVUuWGw9QD";// 您的ak
-	private String SK = "W6jxAWzMXdsThf3UwzPZcvYEXkrYW6rI";// 您的sk的前16位
-
-	private void initVideoControl() {
-		BVideoView.setAKSK(AK, SK);
-
-		mBVideoView.setOnPreparedListener(this);
-		mBVideoView.setOnCompletionListener(this);
-		mBVideoView.setOnErrorListener(this);
-		mBVideoView.setOnInfoListener(this);
-		mBVideoView.setOnPlayingBufferCacheListener(this);
-		mBVideoView.setOnSeekCompleteListener(this);
-
-		mBVideoView.showCacheInfo(false);
-		mBVideoView.setDecodeMode(BVideoView.DECODE_HW);
-		mCacheProgressLayout.setVisibility(GONE);
-
-		mPlayFrame.setOnClickListener(mMediaControlViewVisibilityListener);
-		mVideoFrame.setOnClickListener(mMediaControlViewVisibilityListener);
-
-		mMediaControlView.setOnSeekBarChangeListener(mSeekListener);
-
-		mMediaControlView.setOnPreClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				int pos = mBVideoView.getCurrentPosition();
-				// pos -= 2000; // milliseconds
-				pos -= 2; // seconds
-				mBVideoView.seekTo(pos);
-			}
-		});
-		mMediaControlView.setOnNextClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				int pos = mBVideoView.getCurrentPosition();
-				// pos += 2000; // milliseconds
-				pos += 2; // seconds
-				mBVideoView.seekTo(pos);
-			}
-		});
-		mMediaControlView.setOnPlayPauseClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				doPauseResume();
-				show(sDefaultTimeout);
-			}
-		});
-
-		mMediaControlView.setOnFullClickListener(new View.OnClickListener() {
-			@SuppressWarnings("deprecation")
-			@Override
-			public void onClick(View v) {
-				Activity activity = (Activity) getContext();
-				int screenwidth = activity.getWindowManager().getDefaultDisplay().getWidth();
-				int screenheight = activity.getWindowManager().getDefaultDisplay().getHeight();
-				// 设置屏幕为横屏
-				if (screenwidth < screenheight) {
-					activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-				} else {
-					activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-				}
-			}
-		});
-
-		/**
-		 * 开启后台事件处理线程
-		 */
-		mHandlerThread = new HandlerThread("event handler thread", Process.THREAD_PRIORITY_BACKGROUND);
-		mHandlerThread.start();
-		mEventHandler = new EventHandler(mHandlerThread.getLooper());
-	}
-
-	@Override
-	public void onPlayingBufferCache(final int arg0) {
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				mCacheProgressTv.setText("缓冲 " + arg0 + "%");
-			}
-		});
-	}
-
-	@Override
-	public boolean onInfo(int what, int extra) {
-		switch (what) {
-		case BVideoView.MEDIA_INFO_BUFFERING_START:// 开始缓冲
-			mHandler.post(new Runnable() {
-				@Override
-				public void run() {
-					mCacheProgressTv.setText("缓冲 0%");
-					mCacheProgressLayout.setVisibility(VISIBLE);
-				}
-			});
-			break;
-		case BVideoView.MEDIA_INFO_BUFFERING_END:// 结束缓冲
-			mHandler.post(new Runnable() {
-				@Override
-				public void run() {
-					mCacheProgressLayout.setVisibility(GONE);
-				}
-			});
-			break;
-		default:
-			break;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean onError(int arg0, int arg1) {
-		synchronized (SYNC_Playing) {
-			SYNC_Playing.notify();
-		}
-		mPlayerStatus = PLAYER_STATUS.PLAYER_IDLE;
-		return true;
-	}
-
-	@Override
-	public void onCompletion() {
-		synchronized (SYNC_Playing) {
-			SYNC_Playing.notify();
-		}
-		mPlayerStatus = PLAYER_STATUS.PLAYER_IDLE;
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				mPlayFrame.setVisibility(VISIBLE);
-				mMediaControlView.setProgress(1000);
-				show();
-			}
-		});
-	}
-
-	@Override
-	public void onSeekComplete() {
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
-				show(sDefaultTimeout);
-
-				// Ensure that progress is properly updated in the future,
-				// the call to show() does not guarantee this because it is a
-				// no-op if we are already showing.
-				mHandler.sendEmptyMessage(SHOW_PROGRESS);
-			}
-		});
-	}
-
-	@Override
-	public void onPrepared() {
-		mPlayerStatus = PLAYER_STATUS.PLAYER_PREPARED;
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				measureVideoSize();
-				mCacheProgressLayout.setVisibility(GONE);
-				show();
-			}
-		});
-	}
-
-	private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
-		public void onStartTrackingTouch(SeekBar bar) {
-			show(3600000);
-			mDragging = true;
-
-			// By removing these pending progress messages we make sure
-			// that a) we won't update the progress while the user adjusts
-			// the seekbar and b) once the user is done dragging the thumb
-			// we will post one of these messages to the queue again and
-			// this ensures that there will be exactly one message queued up.
-			mHandler.removeMessages(SHOW_PROGRESS);
-		}
-
-		public void onProgressChanged(SeekBar bar, int progress, boolean fromuser) {
-			if (!fromuser) {
-				// We're not interested in programmatically generated changes to
-				// the progress bar's position.
-				return;
-			}
-
-			long duration = mBVideoView.getDuration();
-			long newposition = (duration * progress) / 1000L;
-			mMediaControlView.setPastTime(stringForTime((int) newposition));
-		}
-
-		public void onStopTrackingTouch(SeekBar bar) {
-			mDragging = false;
-			long duration = mBVideoView.getDuration();
-			long newposition = (duration * bar.getProgress()) / 1000L;
-			mBVideoView.seekTo((int) newposition);
-		}
-	};
-
-	// @Override
-	// public boolean dispatchKeyEvent(KeyEvent event) {
-	// int keyCode = event.getKeyCode();
-	// final boolean uniqueDown = event.getRepeatCount() == 0 &&
-	// event.getAction() == KeyEvent.ACTION_DOWN;
-	// if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK || keyCode ==
-	// KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE || keyCode == KeyEvent.KEYCODE_SPACE) {
-	// if (uniqueDown) {
-	// doPauseResume();
-	// show(sDefaultTimeout);
-	// }
-	// return true;
-	// } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
-	// if (uniqueDown && !mBVideoView.isPlaying()) {
-	// mBVideoView.start();
-	// mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
-	// show(sDefaultTimeout);
-	// }
-	// return true;
-	// } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP || keyCode ==
-	// KeyEvent.KEYCODE_MEDIA_PAUSE) {
-	// if (uniqueDown && mBVideoView.isPlaying()) {
-	// mBVideoView.pause();
-	// mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
-	// show(sDefaultTimeout);
-	// }
-	// return true;
-	// } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode ==
-	// KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE
-	// || keyCode == KeyEvent.KEYCODE_CAMERA) {
-	// // don't show the controls for volume adjustment
-	// return super.dispatchKeyEvent(event);
-	// } else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode ==
-	// KeyEvent.KEYCODE_MENU) {
-	// if (uniqueDown) {
-	// hide();
-	// }
-	// return true;
-	// }
-	//
-	// show(sDefaultTimeout);
-	// return super.dispatchKeyEvent(event);
-	// }
-
-	@Override
-	public void onPause() {
-		if (mPlayerStatus == PLAYER_STATUS.PLAYER_PREPARED) {
-			mLastPos = mBVideoView.getCurrentPosition();
-			mBVideoView.stopPlayback();
-		}
-	}
-
-	@Override
-	public void onResume() {
-		if (mLastPos > 0) {
-			mEventHandler.sendEmptyMessage(EVENT_PLAY);
-		}
-	}
-
-	@Override
-	public void onDestory() {
-		mHandlerThread.quit();
-	}
-
-	public void showHide() {
-		if (isControllerShowing()) {
-			mMediaControlView.setVisibility(GONE);
-			mMediaControlView.setVisibility(VISIBLE);
-		} else {
-			mMediaControlView.setVisibility(VISIBLE);
-			mMediaControlView.setVisibility(GONE);
-		}
-		mMediaControlView.invalidate();
-	}
+        OnPlayingBufferCacheListener, OnSeekCompleteListener {
+
+    private FrameLayout mPlayFrame;
+    private FrameLayout mVideoFrame;
+    private ImageView mThumbImg;
+    private BVideoView mBVideoView;
+    private LinearLayout mCacheProgressLayout;
+    private TextView mCacheProgressTv;
+    private MediaControlView mMediaControlView;
+
+    private StringBuilder mFormatBuilder;
+    private Formatter mFormatter;
+
+    private PublicMessage mPublicMessage;
+
+    public PMsgVideoHeaderView(Context context) {
+        super(context);
+        init();
+    }
+
+    public PMsgVideoHeaderView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    @SuppressLint("NewApi")
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    public PMsgVideoHeaderView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        LayoutInflater.from(getContext()).inflate(R.layout.header_view_p_msg_video, this);
+        setPortraitMode();
+        mPlayFrame = (FrameLayout) findViewById(R.id.play_frame);
+        mVideoFrame = (FrameLayout) findViewById(R.id.video_frame);
+        mThumbImg = (ImageView) findViewById(R.id.thumb_img);
+        mBVideoView = (BVideoView) findViewById(R.id.video_view);
+        mCacheProgressLayout = (LinearLayout) findViewById(R.id.cache_progress_layout);
+        mCacheProgressTv = (TextView) findViewById(R.id.cache_progress_tv);
+        mMediaControlView = (MediaControlView) findViewById(R.id.media_control_view);
+
+        mFormatBuilder = new StringBuilder();
+        mFormatter = new Formatter(mFormatBuilder, Locale.getDefault());
+        initVideoControl();
+    }
+
+    @SuppressWarnings("deprecation")
+    public void setLandscapeMode() {
+        int screenwidth = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getWidth();
+        int screenheight = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getHeight();
+        setLayoutParams(new AbsListView.LayoutParams(screenwidth, screenheight));
+    }
+
+    public void setPortraitMode() {// 设置动态高度为255dp
+        setLayoutParams(new AbsListView.LayoutParams(AbsListView.LayoutParams.MATCH_PARENT, getResources().getDimensionPixelSize(
+                R.dimen.pmsg_media_view_height)));
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        if (changed) {
+            measureVideoSize();
+        }
+    }
+
+    private void measureVideoSize() {
+        if (mBVideoView != null && mPlayerStatus == PLAYER_STATUS.PLAYER_PREPARED) {
+            int width = mBVideoView.getVideoWidth();
+            int height = mBVideoView.getVideoHeight();
+            if (width != 0 && height != 0) {
+                int maxWidth = mVideoFrame.getWidth();
+                int maxHeight = mVideoFrame.getHeight();
+                float widthScale = maxWidth / ((float) width);
+                float heightScale = maxHeight / ((float) height);
+                float scale = widthScale > heightScale ? heightScale : widthScale;
+                int actualWidth = (int) (scale * width);
+                int actualHeight = (int) (scale * height);
+                FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(actualWidth, actualHeight);
+                params.gravity = Gravity.CENTER;
+                mBVideoView.setLayoutParams(params);
+            }
+
+        }
+    }
+
+    /**
+     * 时间显示的工具方法
+     */
+    private String stringForTime(int timeMs) {
+        // timeMs=timeMs/1000; 百度播放器的时间单位就是秒,系统的VideoView是毫秒
+        int seconds = timeMs % 60;
+        int minutes = (timeMs / 60) % 60;
+        int hours = timeMs / 3600;
+
+        mFormatBuilder.setLength(0);
+        if (hours > 0) {
+            return mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
+        } else {
+            return mFormatter.format("%02d:%02d", minutes, seconds).toString();
+        }
+    }
+
+    private String mVideoSource;
+
+    public void attachPublicMessage(PublicMessage publicMessage) {
+        mPublicMessage = publicMessage;
+
+        // mBVideoView.setVideoPath(publicMessage.getBody().getVideos());
+        mVideoSource = mPublicMessage.getFirstVideo();
+        // mVideoSource =
+        // "http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8";
+        String imageUrl = publicMessage.getFirstImageOriginal();
+        if (!TextUtils.isEmpty(imageUrl)) {
+            ImageLoader.getInstance().displayImage(imageUrl, mThumbImg);
+        } else {
+            AvatarHelper.getInstance().displayAvatar(publicMessage.getUserId(), mThumbImg, false);
+        }
+
+        mEventHandler.sendEmptyMessage(EVENT_PLAY);
+    }
+
+    /**
+     * VideoView的控制
+     */
+
+    private EventHandler mEventHandler;
+    private HandlerThread mHandlerThread;
+    private final Object SYNC_Playing = new Object();
+    private int mLastPos = 0;// 记录播放位置
+    private PLAYER_STATUS mPlayerStatus = PLAYER_STATUS.PLAYER_IDLE;// 当前播放状态
+
+    /**
+     * 播放状态
+     */
+    private enum PLAYER_STATUS {
+        PLAYER_IDLE, PLAYER_PREPARING, PLAYER_PREPARED,
+    }
+
+    private static final int EVENT_PLAY = 0;
+
+    class EventHandler extends Handler {
+        public EventHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_PLAY:
+                    if (mPlayerStatus != PLAYER_STATUS.PLAYER_IDLE) {// 如果已经播放了,等待上一次播放结束
+                        synchronized (SYNC_Playing) {
+                            try {
+                                SYNC_Playing.wait();
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                    mHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            mPlayFrame.setVisibility(GONE);
+                            mCacheProgressTv.setText("");
+                            mCacheProgressLayout.setVisibility(VISIBLE);
+                        }
+                    });
+                    mBVideoView.setVideoPath(mVideoSource);// 设置播放url
+                    if (mLastPos > 0) {// 续播,如果需要如此
+                        mBVideoView.seekTo(mLastPos);
+                        mLastPos = 0;
+                    }
+                    mBVideoView.start();// 开始播放
+                    mPlayerStatus = PLAYER_STATUS.PLAYER_PREPARING;
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    private View.OnClickListener mMediaControlViewVisibilityListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if (isControllerShowing()) {
+                hide();
+            } else {
+                show();
+            }
+        }
+    };
+
+    private boolean isControllerShowing() {
+        return mMediaControlView.getVisibility() == VISIBLE;
+    }
+
+    private boolean mDragging = false;// 是否正在拖动进度条
+
+    /**
+     * Show the controller on screen. It will go away automatically after 3 seconds of inactivity.
+     */
+    public void show() {
+        show(sDefaultTimeout);
+    }
+
+    /**
+     * Show the controller on screen. It will go away automatically after 'timeout' milliseconds of inactivity.
+     *
+     * @param timeout The timeout in milliseconds. Use 0 to show the controller until hide() is called.
+     */
+    public void show(int timeout) {
+        mMediaControlView.setVisibility(VISIBLE);
+        setProgress();
+        mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
+
+        // cause the progress bar to be updated even if mShowing
+        // was already true. This happens, for example, if we're
+        // paused with the progress bar showing the user hits play.
+        mHandler.sendEmptyMessage(SHOW_PROGRESS);
+
+        Message msg = mHandler.obtainMessage(FADE_OUT);
+        if (timeout != 0) {
+            mHandler.removeMessages(FADE_OUT);
+            mHandler.sendMessageDelayed(msg, timeout);
+        }
+    }
+
+    /**
+     * Remove the controller from the screen.
+     */
+    public void hide() {
+        if (isControllerShowing()) {
+            mHandler.removeMessages(SHOW_PROGRESS);
+            mMediaControlView.setVisibility(GONE);
+        }
+    }
+
+    private static final int FADE_OUT = 1;
+    private static final int SHOW_PROGRESS = 2;
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            int pos;
+            switch (msg.what) {
+                case FADE_OUT:
+                    hide();
+                    break;
+                case SHOW_PROGRESS:
+                    pos = setProgress();
+                    if (!mDragging && mBVideoView.isPlaying()) {
+                        msg = obtainMessage(SHOW_PROGRESS);
+                        sendMessageDelayed(msg, 1000 - (pos % 1000));
+                    }
+                    break;
+            }
+        }
+    };
+
+    private int setProgress() {
+        if (mBVideoView == null || mDragging) {
+            return 0;
+        }
+        int position = mBVideoView.getCurrentPosition();
+        int duration = mBVideoView.getDuration();
+        if (duration > 0) {
+            // use long to avoid overflow
+            long pos = 1000L * position / duration;
+            mMediaControlView.setProgress((int) pos);
+        }
+        mMediaControlView.setTotalTime(stringForTime(duration));
+        mMediaControlView.setPastTime(stringForTime(position));
+
+        return position;
+    }
+
+    private void doPauseResume() {
+        if (mPlayerStatus != PLAYER_STATUS.PLAYER_PREPARED) {
+            mEventHandler.sendEmptyMessage(EVENT_PLAY);
+        } else {
+            if (mBVideoView.isPlaying()) {
+                mBVideoView.pause();
+            } else {
+                mBVideoView.resume();
+            }
+        }
+        mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
+    }
+
+    private static final int sDefaultTimeout = 8000;
+
+    private String AK = "z7Z1hMWvmXcDg4rVUuWGw9QD";// 您的ak
+    private String SK = "W6jxAWzMXdsThf3UwzPZcvYEXkrYW6rI";// 您的sk的前16位
+
+    private void initVideoControl() {
+        BVideoView.setAKSK(AK, SK);
+
+        mBVideoView.setOnPreparedListener(this);
+        mBVideoView.setOnCompletionListener(this);
+        mBVideoView.setOnErrorListener(this);
+        mBVideoView.setOnInfoListener(this);
+        mBVideoView.setOnPlayingBufferCacheListener(this);
+        mBVideoView.setOnSeekCompleteListener(this);
+
+        mBVideoView.showCacheInfo(false);
+        mBVideoView.setDecodeMode(BVideoView.DECODE_HW);
+        mCacheProgressLayout.setVisibility(GONE);
+
+        mPlayFrame.setOnClickListener(mMediaControlViewVisibilityListener);
+        mVideoFrame.setOnClickListener(mMediaControlViewVisibilityListener);
+
+        mMediaControlView.setOnSeekBarChangeListener(mSeekListener);
+
+        mMediaControlView.setOnPreClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int pos = mBVideoView.getCurrentPosition();
+                // pos -= 2000; // milliseconds
+                pos -= 2; // seconds
+                mBVideoView.seekTo(pos);
+            }
+        });
+        mMediaControlView.setOnNextClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int pos = mBVideoView.getCurrentPosition();
+                // pos += 2000; // milliseconds
+                pos += 2; // seconds
+                mBVideoView.seekTo(pos);
+            }
+        });
+        mMediaControlView.setOnPlayPauseClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                doPauseResume();
+                show(sDefaultTimeout);
+            }
+        });
+
+        mMediaControlView.setOnFullClickListener(new View.OnClickListener() {
+            @SuppressWarnings("deprecation")
+            @Override
+            public void onClick(View v) {
+                Activity activity = (Activity) getContext();
+                int screenwidth = activity.getWindowManager().getDefaultDisplay().getWidth();
+                int screenheight = activity.getWindowManager().getDefaultDisplay().getHeight();
+                // 设置屏幕为横屏
+                if (screenwidth < screenheight) {
+                    activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                } else {
+                    activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                }
+            }
+        });
+
+        /**
+         * 开启后台事件处理线程
+         */
+        mHandlerThread = new HandlerThread("event handler thread", Process.THREAD_PRIORITY_BACKGROUND);
+        mHandlerThread.start();
+        mEventHandler = new EventHandler(mHandlerThread.getLooper());
+    }
+
+    @Override
+    public void onPlayingBufferCache(final int arg0) {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mCacheProgressTv.setText("缓冲 " + arg0 + "%");
+            }
+        });
+    }
+
+    @Override
+    public boolean onInfo(int what, int extra) {
+        switch (what) {
+            case BVideoView.MEDIA_INFO_BUFFERING_START:// 开始缓冲
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mCacheProgressTv.setText("缓冲 0%");
+                        mCacheProgressLayout.setVisibility(VISIBLE);
+                    }
+                });
+                break;
+            case BVideoView.MEDIA_INFO_BUFFERING_END:// 结束缓冲
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mCacheProgressLayout.setVisibility(GONE);
+                    }
+                });
+                break;
+            default:
+                break;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onError(int arg0, int arg1) {
+        synchronized (SYNC_Playing) {
+            SYNC_Playing.notify();
+        }
+        mPlayerStatus = PLAYER_STATUS.PLAYER_IDLE;
+        return true;
+    }
+
+    @Override
+    public void onCompletion() {
+        synchronized (SYNC_Playing) {
+            SYNC_Playing.notify();
+        }
+        mPlayerStatus = PLAYER_STATUS.PLAYER_IDLE;
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mPlayFrame.setVisibility(VISIBLE);
+                mMediaControlView.setProgress(1000);
+                show();
+            }
+        });
+    }
+
+    @Override
+    public void onSeekComplete() {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
+                show(sDefaultTimeout);
+
+                // Ensure that progress is properly updated in the future,
+                // the call to show() does not guarantee this because it is a
+                // no-op if we are already showing.
+                mHandler.sendEmptyMessage(SHOW_PROGRESS);
+            }
+        });
+    }
+
+    @Override
+    public void onPrepared() {
+        mPlayerStatus = PLAYER_STATUS.PLAYER_PREPARED;
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                measureVideoSize();
+                mCacheProgressLayout.setVisibility(GONE);
+                show();
+            }
+        });
+    }
+
+    private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
+        public void onStartTrackingTouch(SeekBar bar) {
+            show(3600000);
+            mDragging = true;
+
+            // By removing these pending progress messages we make sure
+            // that a) we won't update the progress while the user adjusts
+            // the seekbar and b) once the user is done dragging the thumb
+            // we will post one of these messages to the queue again and
+            // this ensures that there will be exactly one message queued up.
+            mHandler.removeMessages(SHOW_PROGRESS);
+        }
+
+        public void onProgressChanged(SeekBar bar, int progress, boolean fromuser) {
+            if (!fromuser) {
+                // We're not interested in programmatically generated changes to
+                // the progress bar's position.
+                return;
+            }
+
+            long duration = mBVideoView.getDuration();
+            long newposition = (duration * progress) / 1000L;
+            mMediaControlView.setPastTime(stringForTime((int) newposition));
+        }
+
+        public void onStopTrackingTouch(SeekBar bar) {
+            mDragging = false;
+            long duration = mBVideoView.getDuration();
+            long newposition = (duration * bar.getProgress()) / 1000L;
+            mBVideoView.seekTo((int) newposition);
+        }
+    };
+
+    // @Override
+    // public boolean dispatchKeyEvent(KeyEvent event) {
+    // int keyCode = event.getKeyCode();
+    // final boolean uniqueDown = event.getRepeatCount() == 0 &&
+    // event.getAction() == KeyEvent.ACTION_DOWN;
+    // if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK || keyCode ==
+    // KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE || keyCode == KeyEvent.KEYCODE_SPACE) {
+    // if (uniqueDown) {
+    // doPauseResume();
+    // show(sDefaultTimeout);
+    // }
+    // return true;
+    // } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
+    // if (uniqueDown && !mBVideoView.isPlaying()) {
+    // mBVideoView.start();
+    // mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
+    // show(sDefaultTimeout);
+    // }
+    // return true;
+    // } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP || keyCode ==
+    // KeyEvent.KEYCODE_MEDIA_PAUSE) {
+    // if (uniqueDown && mBVideoView.isPlaying()) {
+    // mBVideoView.pause();
+    // mMediaControlView.updatePausePlay(mBVideoView.isPlaying());
+    // show(sDefaultTimeout);
+    // }
+    // return true;
+    // } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode ==
+    // KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE
+    // || keyCode == KeyEvent.KEYCODE_CAMERA) {
+    // // don't show the controls for volume adjustment
+    // return super.dispatchKeyEvent(event);
+    // } else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode ==
+    // KeyEvent.KEYCODE_MENU) {
+    // if (uniqueDown) {
+    // hide();
+    // }
+    // return true;
+    // }
+    //
+    // show(sDefaultTimeout);
+    // return super.dispatchKeyEvent(event);
+    // }
+
+    @Override
+    public void onPause() {
+        if (mPlayerStatus == PLAYER_STATUS.PLAYER_PREPARED) {
+            mLastPos = mBVideoView.getCurrentPosition();
+            mBVideoView.stopPlayback();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mLastPos > 0) {
+            mEventHandler.sendEmptyMessage(EVENT_PLAY);
+        }
+    }
+
+    @Override
+    public void onDestory() {
+        mHandlerThread.quit();
+    }
+
+    public void showHide() {
+        if (isControllerShowing()) {
+            mMediaControlView.setVisibility(GONE);
+            mMediaControlView.setVisibility(VISIBLE);
+        } else {
+            mMediaControlView.setVisibility(VISIBLE);
+            mMediaControlView.setVisibility(GONE);
+        }
+        mMediaControlView.invalidate();
+    }
 }

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

@@ -45,9 +45,9 @@ import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CompanyContactsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.contanct.ContactsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.PlatContactAddPeopleActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
@@ -55,9 +55,9 @@ import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+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;

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

@@ -32,24 +32,24 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.UUFriendSortAdapter;
 import com.core.model.AttentionUser;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.xzjmyk.pm.activity.sortlist.SideBar;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+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;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/BaseInfoActivity.java

@@ -44,8 +44,8 @@ import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSexActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSingleTextActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.me.BasicInfoEditActivity;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java

@@ -42,8 +42,8 @@ import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,7 +17,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
+import com.core.model.Hrorgs;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 
 import java.util.List;

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

@@ -41,21 +41,21 @@ import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
-import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.model.Hrorgs;
+import com.core.model.HrorgsEntity;
 import com.core.net.http.ViewUtil;
 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 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/InformActivity.java

@@ -21,14 +21,13 @@ import com.lidroid.xutils.ViewUtils;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 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;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ManageAllSubscriptionActivity.java

@@ -5,11 +5,11 @@ import android.os.Bundle;
 import android.widget.ListView;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.core.model.SubscriptionNumber;
 import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.AllRemovedSubsAdapter;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.im.Constants;

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

@@ -27,7 +27,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
 import com.core.net.http.ViewUtil;

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

@@ -23,7 +23,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
 import com.core.net.http.ViewUtil;

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

@@ -22,14 +22,13 @@ import com.lidroid.xutils.ViewUtils;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 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;
 

+ 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;

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

@@ -44,27 +44,27 @@ import com.core.model.User;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.contacts.ContactsAdapter;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.model.EmployeesEntity;
 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;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+import com.core.net.http.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.util.unknown.ContactsUtils;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.ObjectResult;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/AddBusinessActivity.java

@@ -30,9 +30,9 @@ import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;

+ 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;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -36,8 +36,8 @@ import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

+ 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/form/SelectCalendarActivity.java

@@ -41,7 +41,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUAS;

+ 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/AddContactsActivity.java

@@ -31,7 +31,7 @@ import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
+import com.core.net.http.http.OnHttpResultListener;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -30,8 +30,8 @@ import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 import com.core.net.http.ViewUtil;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ChangeMobileActivity.java

@@ -30,9 +30,9 @@ import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;

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

@@ -34,8 +34,8 @@ import com.xzjmyk.pm.activity.adapter.NodeAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;

+ 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;

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

@@ -70,8 +70,8 @@ import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.AddCostBean;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.CostFormModel;
 import com.core.net.http.ViewUtil;

+ 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;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -65,9 +65,9 @@ import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.util.oa.OAHttpUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.OACalendarView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -54,9 +54,9 @@ import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;

+ 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;

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

@@ -38,8 +38,8 @@ import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -28,11 +28,11 @@ 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.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 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;

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

@@ -21,21 +21,21 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
+import com.core.model.HrorgsEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
 import com.xzjmyk.pm.activity.util.oa.OAConfig;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 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;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectRemarkActivity.java

@@ -28,9 +28,9 @@ import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

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

@@ -18,8 +18,8 @@ import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.AttenddancesBean;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;

+ 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;

+ 4 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -28,11 +28,11 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.core.xmpp.model.ChatMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.ChatMessageDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
@@ -45,7 +45,7 @@ import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
-import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
+import com.core.xmpp.listener.ChatMessageListener;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

+ 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;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsPresenter.java

@@ -28,7 +28,7 @@ import com.core.model.User;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
@@ -41,7 +41,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.unknown.ContactsUtils;
 import com.common.data.ListUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/setting/ComApprovalUtil.java

@@ -6,8 +6,8 @@ import android.util.Log;
 
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 

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

@@ -9,9 +9,8 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.core.model.SubscriptionNumber;
 import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/AllRemovedSubsItemAdapter.java

@@ -10,8 +10,8 @@ import android.widget.TextView;
 
 import com.common.preferences.SharedUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.model.SubscriptionNumber;
+import com.core.dao.DBManager;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java

@@ -28,9 +28,9 @@ import com.xzjmyk.pm.activity.ui.erp.view.oacalender.CalenderView;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.WorkHandlerUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendancesFragment.java

@@ -23,9 +23,9 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.TeamsAttShowActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -21,10 +21,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.AllSubscriptionAdapter;
 import com.xzjmyk.pm.activity.adapter.SubsTypeAdapter;
-import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.core.model.SubscriptionNumber;
 import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
 import com.xzjmyk.pm.activity.ui.erp.activity.SubscribeDetailActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionMyFragment.java

@@ -13,9 +13,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.MySubscriptionAdapter;
-import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
+import com.core.model.PersonalSubscriptionBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.SubscribeDetailActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;

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

@@ -24,8 +24,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
 import com.core.model.AttentionUser;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.listener.OnCompleteListener;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
@@ -33,14 +33,14 @@ import com.xzjmyk.pm.activity.sortlist.SideBar;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 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;

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

@@ -10,7 +10,7 @@ import com.common.data.StringUtil;
 import com.common.hmac.HmacUtils;
 import com.common.thread.ThreadUtil;
 import com.xzjmyk.pm.activity.util.OpenFilesUtils;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+import com.core.net.http.http.OAHttpHelper;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java

@@ -19,9 +19,9 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddFlihtsView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.OAConfig;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.bean.HrorgsModel;
 import com.core.utils.TimeUtils;
 import com.core.api.wxapi.ApiConfig;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddVisitReportPresenter.java

@@ -13,9 +13,9 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.utils.TimeUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

+ 5 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java

@@ -16,17 +16,17 @@ import com.common.thread.ThreadUtil;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormFieldActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.ApprovalRecord;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IApproval;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/FlightsPresernter.java

@@ -15,9 +15,9 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.FlightsModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.FlightsTimeModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IFlightsView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

+ 5 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MessagePresenter.java

@@ -26,8 +26,8 @@ import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.ChatMessageDao;
+import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MessageDao;
 import com.xzjmyk.pm.activity.db.dao.SubsDao;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
@@ -42,9 +42,9 @@ import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -22,9 +22,9 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.util.oa.WorkHandlerUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.utils.TimeUtils;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/OAPresenter.java

@@ -16,9 +16,9 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IOAView;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.OAHttpUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java

@@ -19,9 +19,9 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.core.utils.TimeUtils;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectCollisionPresenter.java

@@ -20,9 +20,9 @@ import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.core.dao.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
@@ -30,7 +30,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+import com.core.net.http.http.OAHttpHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SubscriptionPresenter.java

@@ -13,9 +13,9 @@ import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISubscriptionView;
 import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.util.HashMap;

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -33,9 +33,9 @@ import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.WorkHandlerUtil;
-import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.oa.http.Request;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
 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/presenter/WorkPresenterhi.java

@@ -4,7 +4,7 @@ import android.os.Bundle;
 
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkPresenter;
-import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
+import com.core.net.http.http.OnHttpResultListener;
 
 import java.util.ArrayList;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ApprovaNodeUtil.java

@@ -7,8 +7,8 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

Некоторые файлы не были показаны из-за большого количества измененных файлов