移动语音搜索框

WeiChat/build.gradle

@@ -97,6 +97,7 @@ dependencies {
     releaseCompile deps.leakcanaryNp
     //project
     compile project(':common')
+    compile project(':appcontact')
     compile project(':pullToRefershLibraryMy')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 
 /**
  * 通用选择员工和选择部门通用实体类

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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,7 +55,7 @@ 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.xzjmyk.pm.activity.ui.message.ChatActivity;

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.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.view.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;

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;

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;

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;

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

@@ -41,15 +41,15 @@ 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;

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;
 

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;

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;

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;

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;
 

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

@@ -44,16 +44,16 @@ 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;
@@ -64,7 +64,7 @@ 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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

@@ -30,9 +30,9 @@ 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.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;

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

@@ -21,16 +21,16 @@ 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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;

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,8 +33,8 @@ 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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java

@@ -43,15 +43,15 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
+import com.core.xmpp.model.MucRoom;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.core.app.Constants;
-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.base.EasyFragment;
-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.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.core.utils.TimeUtils;

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

@@ -26,7 +26,7 @@ import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
-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.sortlist.BaseSortModel;
 import com.core.base.BaseActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java

@@ -32,9 +32,9 @@ 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.bean.message.MucRoom;
+import com.core.xmpp.model.MucRoom;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
-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.base.EasyFragment;

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

@@ -45,10 +45,10 @@ import com.xzjmyk.pm.activity.bean.Area;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.MucRoomSimple;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
+import com.core.xmpp.model.MucRoom;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.dao.FriendDao;
 import com.core.dao.UserDao;
 import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/BasicInfoEditActivity.java

@@ -37,8 +37,8 @@ import com.core.dao.UserDao;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.helper.LoginHelper;
 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.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/AddContactsActivity.java

@@ -47,7 +47,7 @@ import com.xzjmyk.pm.activity.bean.MucRoomSimple;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
-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.erp.net.HttpUtil;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -39,11 +39,11 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.core.xmpp.model.ChatMessage;
 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.util.im.downloader.Downloader;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadEngine;
@@ -65,7 +65,7 @@ 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.ReceiptManager;
-import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
+import com.core.xmpp.listener.ChatMessageListener;
 
 import java.io.File;
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/InstantMessageActivity.java

@@ -18,8 +18,8 @@ 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.bean.message.ChatMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.model.ChatMessage;
+import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MucChatActivity.java

@@ -38,13 +38,13 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
-import com.xzjmyk.pm.activity.bean.message.MucRoomMember;
+import com.core.xmpp.model.ChatMessage;
+import com.core.xmpp.model.MucRoom;
+import com.core.xmpp.model.MucRoomMember;
 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.util.im.downloader.Downloader;
 import com.xzjmyk.pm.activity.util.im.helper.UploadEngine;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
@@ -64,8 +64,8 @@ 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.ReceiptManager;
-import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
-import com.xzjmyk.pm.activity.xmpp.listener.MucListener;
+import com.core.xmpp.listener.ChatMessageListener;
+import com.core.xmpp.listener.MucListener;
 
 import java.io.File;
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/NewFriendActivity.java

@@ -31,7 +31,7 @@ import com.core.model.AttentionUser;
 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.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.core.base.BaseActivity;
@@ -42,7 +42,7 @@ import com.core.net.volley.Result;
 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.ArrayList;
 import java.util.HashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java

@@ -39,18 +39,18 @@ 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.bean.message.MucRoom;
-import com.xzjmyk.pm.activity.bean.message.MucRoom.Notice;
-import com.xzjmyk.pm.activity.bean.message.MucRoomMember;
+import com.core.xmpp.model.MucRoom;
+import com.core.xmpp.model.MucRoom.Notice;
+import com.core.xmpp.model.MucRoomMember;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.core.app.Constants;
-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.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.HrorgsEntity;
+import com.core.dao.DBManager;
+import com.core.model.HrorgsEntity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;

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

@@ -20,8 +20,8 @@ import com.android.volley.VolleyError;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
-import com.xzjmyk.pm.activity.bean.message.MucRoomMember;
+import com.core.xmpp.model.MucRoom;
+import com.core.xmpp.model.MucRoomMember;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectCardActivity.java

@@ -21,7 +21,7 @@ import com.common.ui.ViewHolder;
 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.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.xmpp.CoreService;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectNewContactsActivity.java

@@ -20,8 +20,8 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.model.ChatMessage;
+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;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectNewGroupInstantActivity.java

@@ -15,8 +15,8 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.core.xmpp.model.ChatMessage;
+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;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/uas/B2bMsgActivity.java

@@ -28,8 +28,8 @@ import com.xzjmyk.pm.activity.CommonWebviewActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.B2BMsg;
+import com.core.dao.DBManager;
+import com.core.model.B2BMsg;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -47,8 +47,8 @@ import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
-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;

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

@@ -36,7 +36,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.activity.WebViewLoadActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/CreateRoomUtil.java

@@ -16,12 +16,12 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
+import com.core.xmpp.model.ChatMessage;
+import com.core.xmpp.model.MucRoom;
 import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
-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.util.im.helper.UploadEngine;
 import com.core.utils.ToastUtil;
 import com.core.net.volley.ArrayResult;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/FriendHelper.java

@@ -12,9 +12,9 @@ import com.core.model.Friend;
 import com.core.model.CircleMessage;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
+import com.core.xmpp.dao.ChatMessageDao;
 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.sp.TableVersionSp;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.FastVolley;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/UploadEngine.java

@@ -10,9 +10,9 @@ import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.core.xmpp.model.ChatMessage;
 import com.core.model.XmppMessage;
-import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
+import com.core.xmpp.dao.ChatMessageDao;
 import com.core.net.volley.Result;
 
 import org.apache.http.Header;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpSigninUitl.java

@@ -39,9 +39,9 @@ import com.common.data.ListUtils;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
-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;