ソースを参照

完成工具类的修改

Bitliker 9 年 前
コミット
67c45683a7
100 ファイル変更149 行追加124 行削除
  1. 1 1
      WeiChat/src/main/AndroidManifest.xml
  2. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocApprovalFlowAdapter.java
  3. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java
  4. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/FriendSortAdapter.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/NewFriendAdapter.java
  6. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PersonalQzoneAdapter.java
  7. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PlatComAfAdapter.java
  8. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java
  9. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/UUFriendSortAdapter.java
  10. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/UserAdapter.java
  11. 3 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/DateTimeReceiver.java
  12. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  13. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java
  14. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/UserCheckedActivity.java
  15. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java
  16. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java
  17. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginHistoryActivity.java
  18. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterUserBasicInfoActivity.java
  19. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/AttentionFragment.java
  20. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/FriendFragment.java
  21. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java
  22. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java
  23. 2 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleFragment.java
  24. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PMsgDetailActivity.java
  25. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PersonalQzoneActivity.java
  26. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendAudioActivity.java
  27. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java
  28. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendVideoActivity.java
  29. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java
  30. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgAudioHeaderView.java
  31. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgDetailHeaderView.java
  32. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgImageHeaderView.java
  33. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgVideoHeaderView.java
  34. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/BaseInfoActivity.java
  35. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java
  36. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.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/crm/CustomerListActivity.java
  39. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/SalesRankingActivity.java
  40. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java
  41. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java
  42. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java
  43. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutLogListActivity.java
  44. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatWDdetailyActivity.java
  45. 5 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkActivity.java
  46. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java
  47. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/ContactExpanAdapter.java
  48. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/MessageAdapter.java
  49. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/contacts/ContactsAdapter.java
  50. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/ApprovalAdapter.java
  51. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/SelectCollisionAdapter.java
  52. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/SelectPCollisionAdapter.java
  53. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/OutofficeFragment.java
  54. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/find/FindAdapter.java
  55. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java
  56. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/CreateGroupActivity.java
  57. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java
  58. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java
  59. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/BasicInfoEditActivity.java
  60. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/InfoCodeActivity.java
  61. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java
  62. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java
  63. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/AddContactsActivity.java
  64. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java
  65. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/InstantMessageActivity.java
  66. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/InstantMessageConfirm.java
  67. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MucChatActivity.java
  68. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/NewFriendActivity.java
  69. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java
  70. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectActivity.java
  71. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectCardActivity.java
  72. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java
  73. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/CreateRoomUtil.java
  74. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/RoomImageUtil.java
  75. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownLoadingInfo.java
  76. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloadListener.java
  77. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloadProgressListener.java
  78. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloadTask.java
  79. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/Downloader.java
  80. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloaderEngine.java
  81. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/FailReason.java
  82. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/ViewAware.java
  83. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/AvatarHelper.java
  84. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/FileDataHelper.java
  85. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/FriendHelper.java
  86. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/LoginHelper.java
  87. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/UploadEngine.java
  88. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/UploadService.java
  89. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/OAHttpUtil.java
  90. 0 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/PopupWindowHelper.java
  91. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/RecognizerDialogUtil.java
  92. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/http/OAHttpHelper.java
  93. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CarouselImageView.java
  94. 6 6
      WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java
  95. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/Result.java
  96. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XChatManager.java
  97. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XReconnectionManager.java
  98. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepListActivity.java
  99. 4 0
      app_core/common/src/main/java/com/common/data/JSONUtil.java
  100. 20 0
      app_core/common/src/main/java/com/common/system/SystemUtil.java

+ 1 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -756,7 +756,7 @@
         </receiver>
         <!-- 在百度开发者中心查询应用的API Key -->
 
-        <receiver android:name=".util.oa.DateTimeReceiver">
+        <receiver android:name=".broadcast.DateTimeReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DATE_CHANGED" />
             </intent-filter>

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.common.data.ListUtils;
 
 import java.util.List;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.common.data.ListUtils;
 

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

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SelectPicPopupWindow;

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

@@ -15,7 +15,7 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.util.List;
 

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

@@ -38,7 +38,7 @@ 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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;

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

@@ -13,7 +13,7 @@ import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.common.data.ListUtils;
 
 import java.util.List;

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

@@ -39,7 +39,7 @@ 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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;

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

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SelectPicPopupWindow;

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

@@ -14,7 +14,7 @@ import com.common.ui.ViewHolder;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.text.DecimalFormat;
 import java.util.List;

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/DateTimeReceiver.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/DateTimeReceiver.java

@@ -1,9 +1,11 @@
-package com.xzjmyk.pm.activity.util.oa;
+package com.xzjmyk.pm.activity.broadcast;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.xzjmyk.pm.activity.util.oa.AutoErpSigninUitl;
+
 /**
  * 日期改变监听器
  * <p>

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

@@ -59,7 +59,7 @@ import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;

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

@@ -23,7 +23,7 @@ import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;

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

@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.base.ActivityStack;

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

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;

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

@@ -24,8 +24,8 @@ import com.common.ui.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -24,8 +24,8 @@ import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult.Login;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.ActivityStack;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterUserBasicInfoActivity.java

@@ -34,7 +34,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;

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

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;

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

@@ -35,7 +35,7 @@ import com.xzjmyk.pm.activity.bean.message.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.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;

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

@@ -57,8 +57,8 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
 import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;

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

@@ -50,8 +50,8 @@ 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.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FileDataHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;

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

@@ -32,8 +32,8 @@ import com.xzjmyk.pm.activity.bean.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FileDataHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
@@ -48,7 +48,6 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.view.CarouselImageView;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;

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

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.bean.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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgDetailHeaderView;

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

@@ -49,8 +49,8 @@ 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.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FileDataHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;

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

@@ -25,8 +25,8 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;

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

@@ -39,8 +39,8 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;

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

@@ -36,8 +36,8 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;

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

@@ -55,8 +55,8 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;

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

@@ -19,7 +19,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 

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

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 

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

@@ -14,7 +14,7 @@ import android.widget.ImageView.ScaleType;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.view.CarouselImageView;
 
 import java.util.ArrayList;

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

@@ -34,7 +34,7 @@ import com.baidu.cyberplayer.core.BVideoView.OnSeekCompleteListener;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.util.Formatter;
 import java.util.Locale;

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

@@ -37,8 +37,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;

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

@@ -34,7 +34,7 @@ import com.xzjmyk.pm.activity.adapter.CommonDocApprovalFlowAdapter;
 import com.xzjmyk.pm.activity.adapter.CommonDocMainMsgAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;

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

@@ -42,7 +42,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;

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

@@ -28,7 +28,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;

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

@@ -33,7 +33,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;

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

@@ -24,7 +24,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -46,8 +46,8 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;

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

@@ -33,7 +33,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.setting.ComApprovalUtil;

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

@@ -29,7 +29,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.DailyDetailsApprovalFlowAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;

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

@@ -27,7 +27,7 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -36,7 +36,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;

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

@@ -24,6 +24,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.SystemUtil;
@@ -37,10 +38,9 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.oa.WorkAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.WorkPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.oa.WifiReceiverUtil;
 import com.xzjmyk.pm.activity.ui.me.OfficeAddressSettingsActivity;
 import com.xzjmyk.pm.activity.ui.me.SignSeniorSettingActivity;
+import com.xzjmyk.pm.activity.util.oa.WifiReceiverUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
@@ -145,7 +145,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
         findViewById(R.id.unoffice_).setOnClickListener(this);
         date_tv.setOnClickListener(this);
 
-        
+
     }
 
     @Override
@@ -351,7 +351,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
             @Override
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
-                selectTime = DateFormatUtil.str2Long(time,DateFormatUtil.YMD);
+                selectTime = DateFormatUtil.str2Long(time, DateFormatUtil.YMD);
                 isToday = time.equals(DateFormatUtil.long2Str(DateFormatUtil.YMD)) ? true : false;
                 date_tv.setText(year + "年" + month + "月" + day + "日 " + CalendarUtil.getWeek(selectTime));
                 presenter.loadWorkData(selectTime, true);
@@ -363,6 +363,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
     public void getMac() {
         macAddress = SystemUtil.getMac(ct);
         if (StringUtil.isEmpty(macAddress)) {
+            //当没有获取到MACAddress的时候,判断wifi状态,如果wifi为未启动
             //mac地址不合法时候   提示开启wifi
             WifiReceiverUtil wifiReceiver = new WifiReceiverUtil();
             wifiReceiver.regReceiver(ct, new WifiReceiverUtil.OnWifiStatusChangeLinstener() {

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

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.bean.message.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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.common.data.ListUtils;
 
 import java.util.List;

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

@@ -15,7 +15,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;

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

@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 
 import java.util.ArrayList;

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

@@ -22,7 +22,7 @@ import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;

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

@@ -12,7 +12,7 @@ import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.common.data.ListUtils;
 

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

@@ -13,7 +13,7 @@ import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.common.data.ListUtils;

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

@@ -34,7 +34,7 @@ import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SearchPoiParam;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutLogListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/find/FindAdapter.java

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.common.ui.ViewHolder;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.util.List;
 

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

@@ -44,7 +44,7 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.MucRoom;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;

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

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.bean.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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.im.CreateRoomUtil;

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

@@ -35,7 +35,7 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.MucRoom;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;

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

@@ -50,7 +50,7 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 import com.common.file.PropertiesUtil;

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

@@ -34,8 +34,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/InfoCodeActivity.java

@@ -34,7 +34,7 @@ import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.xzjmyk.pm.activity.CaptureResultActivity;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -34,7 +34,7 @@ import com.xzjmyk.pm.activity.CaptureResultActivity;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -41,7 +41,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.InAndExitTimeDao;
 import com.xzjmyk.pm.activity.db.dao.VideoFileDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;

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

@@ -48,7 +48,7 @@ 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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 import com.xzjmyk.pm.activity.ui.groupchat.SelectContactsActivity;

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

@@ -44,9 +44,9 @@ import com.xzjmyk.pm.activity.bean.message.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.xzjmyk.pm.activity.downloader.Downloader;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
-import com.xzjmyk.pm.activity.helper.UploadEngine;
+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;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendBaiDuLocate;

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

@@ -20,7 +20,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;
 

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

@@ -15,7 +15,7 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.R;
 
 /**

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

@@ -45,8 +45,8 @@ import com.xzjmyk.pm.activity.bean.message.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.xzjmyk.pm.activity.downloader.Downloader;
-import com.xzjmyk.pm.activity.helper.UploadEngine;
+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;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendBaiDuLocate;

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

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;

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

@@ -44,7 +44,7 @@ import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;

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

@@ -22,7 +22,7 @@ import com.xzjmyk.pm.activity.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.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.volley.FastVolley;

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

@@ -22,7 +22,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 

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

@@ -41,7 +41,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;

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

@@ -22,7 +22,7 @@ import com.xzjmyk.pm.activity.bean.message.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.xzjmyk.pm.activity.helper.UploadEngine;
+import com.xzjmyk.pm.activity.util.im.helper.UploadEngine;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.ObjectResult;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/RoomImageUtil.java

@@ -21,7 +21,7 @@ import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 import com.xzjmyk.pm.activity.ui.groupchat.SelectContactsActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownLoadingInfo.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownLoadingInfo.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import java.util.concurrent.locks.ReentrantLock;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloadListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloadListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *******************************************************************************/
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import android.view.View;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloadProgressListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloadProgressListener.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import android.view.View;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloadTask.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloadTask.java

@@ -1,8 +1,8 @@
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import android.os.Handler;
 
-import com.xzjmyk.pm.activity.downloader.FailReason.FailType;
+import com.xzjmyk.pm.activity.util.im.downloader.FailReason.FailType;
 
 import java.io.File;
 import java.io.FileNotFoundException;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/Downloader.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/Downloader.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import android.os.Handler;
 import android.os.Looper;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloaderEngine.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/DownloaderEngine.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import android.annotation.SuppressLint;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/FailReason.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/FailReason.java

@@ -1,5 +1,5 @@
 
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 public class FailReason {
 	

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/ViewAware.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/downloader/ViewAware.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.downloader;
+package com.xzjmyk.pm.activity.util.im.downloader;
 
 import android.view.View;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/AvatarHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/AvatarHelper.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.helper;
+package com.xzjmyk.pm.activity.util.im.helper;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/FileDataHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/FileDataHelper.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.helper;
+package com.xzjmyk.pm.activity.util.im.helper;
 
 import android.content.Context;
 import android.os.Handler;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/FriendHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/FriendHelper.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.helper;
+package com.xzjmyk.pm.activity.util.im.helper;
 
 import android.content.Context;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/LoginHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/LoginHelper.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.helper;
+package com.xzjmyk.pm.activity.util.im.helper;
 
 import android.content.Context;
 import android.content.Intent;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/UploadEngine.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/UploadEngine.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.helper;
+package com.xzjmyk.pm.activity.util.im.helper;
 
 import android.text.TextUtils;
 import android.util.Log;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/UploadService.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/helper/UploadService.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.helper;
+package com.xzjmyk.pm.activity.util.im.helper;
 
 import android.text.TextUtils;
 

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/OAHttpUtil.java

@@ -20,6 +20,7 @@ import java.util.Set;
 
 
 /**
+ * OA首页接口方面请求和处理方法处理工具
  * Created by Bitliker on 2017/3/28.
  */
 

+ 0 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/PopupWindowHelper.java

@@ -114,9 +114,6 @@ public class PopupWindowHelper {
 
     }
 
-
-
-
     private static void setBack(String company, SelectAimModel model, OnClickListener onClickListener) {
         if (model == null) {
             model = new SelectAimModel();

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/RecognizerDialogUtil.java

@@ -8,6 +8,7 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.xzjmyk.pm.activity.MyApplication;
 
 /**
+ * 语音输入提示框
  * Created by Bitliker on 2017/6/12.
  */
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/http/OAHttpHelper.java

@@ -33,7 +33,7 @@ public class OAHttpHelper extends Handler {
 
 
     public ApiModel getApiModel() {
-        return apiModel == null ? ApiUtils.getApiModel() : apiModel;
+        return apiModel == null ? apiModel=ApiUtils.getApiModel() : apiModel;
     }
 
     private OAHttpHelper() {

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CarouselImageView.java

@@ -17,7 +17,7 @@ import com.common.system.AnimationUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.util.ArrayList;
 import java.util.List;

+ 6 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -58,9 +58,9 @@ import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
 import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.downloader.DownloadListener;
-import com.xzjmyk.pm.activity.downloader.Downloader;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.downloader.DownloadListener;
+import com.xzjmyk.pm.activity.util.im.downloader.Downloader;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BaiduMapActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.CardInfoActivity;
@@ -1410,7 +1410,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
         }
 
         @Override
-        public void onFailed(String uri, com.xzjmyk.pm.activity.downloader.FailReason failReason, View view) {
+        public void onFailed(String uri, com.xzjmyk.pm.activity.util.im.downloader.FailReason failReason, View view) {
             if (view != null) {
                 view.setVisibility(GONE);
             }
@@ -1448,7 +1448,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
         }
 
         @Override
-        public void onFailed(String uri, com.xzjmyk.pm.activity.downloader.FailReason failReason, View view) {
+        public void onFailed(String uri, com.xzjmyk.pm.activity.util.im.downloader.FailReason failReason, View view) {
             if (view != null) {
                 view.setVisibility(GONE);
             }
@@ -1488,7 +1488,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
         }
 
         @Override
-        public void onFailed(String uri, com.xzjmyk.pm.activity.downloader.FailReason failReason, View view) {
+        public void onFailed(String uri, com.xzjmyk.pm.activity.util.im.downloader.FailReason failReason, View view) {
             if (view != null) {
                 view.setVisibility(GONE);
             }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/Result.java

@@ -15,7 +15,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XChatManager.java

@@ -19,7 +19,7 @@ import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
 import com.xzjmyk.pm.activity.xmpp.util.XmppStringUtil;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XReconnectionManager.java

@@ -10,7 +10,7 @@ import com.common.LogUtil;
 import com.common.system.SystemUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.LoginAuto;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.volley.Result;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepListActivity.java

@@ -15,7 +15,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

+ 4 - 0
app_core/common/src/main/java/com/common/data/JSONUtil.java

@@ -79,4 +79,8 @@ public class JSONUtil {
         return urlBuilder.toString();
     }
 
+
+
+
+
 }

+ 20 - 0
app_core/common/src/main/java/com/common/system/SystemUtil.java

@@ -6,6 +6,7 @@ import android.content.ClipData;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Environment;
 import android.os.StatFs;
@@ -251,4 +252,23 @@ public class SystemUtil {
         }
         return null;
     }
+
+
+    /**
+     *   附:Wifi状态有以下几种:(括号内为所对应的的int值)
+     *   1. WifiManager.WIFI_STATE_DISABLED (1)   //禁用WiFi状态
+     *   2. WifiManager.WIFI_STATE_ENABLED (3)  //WiFi启用状态
+     *   3. WifiManager.WIFI_STATE_DISABLING (0)  //禁用WiFi状态
+     *   4  WifiManager.WIFI_STATE_ENABLING  (2)    //可以启动wifi
+     *
+     * @param context
+     * @return
+     */
+    public static int getWifiStatus(Context context) {
+        WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        if (wifiManager != null) {
+            return wifiManager.getWifiState();
+        }
+        return 0;
+    }
 }