项目整改部分

WeiChat/src/main/java/com/ipaulpro/afilechooser/FileReceiverActivity.java

@@ -18,7 +18,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.message.InstantMessageActivity;
-import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.im.Constants;
 
 import java.io.File;
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/CaptureResultActivity.java

@@ -15,11 +15,11 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.common.file.DownloadUtil;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.me.ScanInfoResultsActivity;
-import com.xzjmyk.pm.activity.util.DownloadUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.LifecycleCallback;

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -12,7 +12,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.xzjmyk.pm.activity.util.DownloadUtil;
+import com.common.file.DownloadUtil;
 
 /**
  * 公共网页打开页面

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -19,6 +19,7 @@ import com.android.volley.toolbox.Volley;
 import com.baidu.mapapi.SDKInitializer;
 import com.common.config.BaseApplication;
 import com.common.preferences.PreferenceUtils;
+import com.common.preferences.SharedUtil;
 import com.facebook.stetho.Stetho;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechUtility;
@@ -46,8 +47,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.SubscribeDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.FileUtils;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
-import com.xzjmyk.pm.activity.util.Constants;
-import com.xzjmyk.pm.activity.util.SharedUtil;
+import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.AuthImageDownloader;
 import com.xzjmyk.pm.activity.volley.FastVolley;

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

@@ -14,6 +14,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 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;
@@ -21,7 +22,6 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;

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

@@ -14,6 +14,7 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 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;
@@ -22,7 +23,6 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;

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

@@ -9,13 +9,13 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.ui.ViewHolder;
+import com.xzjmyk.pm.activity.R;
 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.R;
-import com.xzjmyk.pm.activity.util.ViewHolder;
 
 import java.util.List;
 

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

@@ -22,6 +22,7 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
 import com.common.system.SystemUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -47,9 +48,8 @@ import com.xzjmyk.pm.activity.ui.circle.showCEView;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyAddActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.HtmlUtils;
-import com.xzjmyk.pm.activity.util.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
+import com.xzjmyk.pm.activity.util.im.HtmlUtils;
+import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;

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

@@ -22,6 +22,8 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.system.SystemUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -46,11 +48,9 @@ import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
 import com.xzjmyk.pm.activity.ui.circle.showCEView;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.HtmlUtils;
-import com.xzjmyk.pm.activity.util.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
+import com.xzjmyk.pm.activity.util.im.HtmlUtils;
+import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
@@ -370,15 +370,15 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         viewHolder.avatar_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (getType() == AppConstant.CIRCLE_TYPE_MY_BUSINESS && (mContext instanceof  BusinessCircleActivity)){
-                        Intent intent = new Intent(mContext, BusinessCircleActivity.class);
-                        intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
-                        intent.putExtra(AppConstant.EXTRA_USER_ID, message.getUserId());
-                        intent.putExtra(AppConstant.EXTRA_NICK_NAME, mShowNameMaps.get(userId));
-                        mContext.startActivity(intent);
+                if (getType() == AppConstant.CIRCLE_TYPE_MY_BUSINESS && (mContext instanceof BusinessCircleActivity)) {
+                    Intent intent = new Intent(mContext, BusinessCircleActivity.class);
+                    intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
+                    intent.putExtra(AppConstant.EXTRA_USER_ID, message.getUserId());
+                    intent.putExtra(AppConstant.EXTRA_NICK_NAME, mShowNameMaps.get(userId));
+                    mContext.startActivity(intent);
                 } else {
 //                    Toast.makeText(mContext,"点了也没用",Toast.LENGTH_SHORT).show();
-                   return;
+                    return;
                 }
             }
         });
@@ -397,7 +397,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             viewHolder.body_tv.setVisibility(View.GONE);
         } else {
             viewHolder.body_tv.setVisibility(View.VISIBLE);
-            if(body.getText().contains("我也去分享")){
+            if (body.getText().contains("我也去分享")) {
                 viewHolder.daily_share_tv.setVisibility(View.VISIBLE);
                 viewHolder.daily_share_tv.setText(MyApplication.getInstance().getString(R.string.wd_experience_title));
 
@@ -412,7 +412,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
 //                        }
 //                    }
 //                });
-            }else{
+            } else {
                 viewHolder.daily_share_tv.setVisibility(View.GONE);
                 viewHolder.daily_share_tv.setText(MyApplication.getInstance().getString(R.string.qzone_out_share));
             }
@@ -428,11 +428,9 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         });
 
 
-
         // 设置发布时间 "yyy年MM月dd日 HH:mm"
 //        viewHolder.time_tv.setText(TimeUtils.getPreciseTimeDesc(message.getTime()));
-        viewHolder.time_tv.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(TimeUtils.getPreciseTimeDesc(message.getTime())),
-                        "yyyy-MM-dd HH:mm"));
+        viewHolder.time_tv.setText(DateFormatUtil.long2Str(message.getTime() * 1000, "yyyy-MM-dd HH:mm"));
 
 
         // 设置删除按钮
@@ -484,7 +482,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
 
         if (comments != null && comments.size() > 0) {
             viewHolder.command_listView.setVisibility(View.VISIBLE);
-                mAdapter = new CommentAdapter(position, comments);
+            mAdapter = new CommentAdapter(position, comments);
             viewHolder.command_listView.setAdapter(mAdapter);
         } else {
             viewHolder.command_listView.setVisibility(View.GONE);

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

@@ -10,11 +10,11 @@ import android.widget.TextView;
 
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
+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.ViewHolder;
 
 import java.text.DecimalFormat;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/NewFriendMessage.java

@@ -4,11 +4,11 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.CalendarUtil;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.io.Serializable;
 import java.util.UUID;
@@ -207,7 +207,7 @@ public class NewFriendMessage extends XmppMessage implements Cloneable, Serializ
 		message.setFromUserId(fromUser.getUserId());
 		message.setFromUserName(fromUser.getNickName());
 		message.setFromCompanyId(fromUser.getCompanyId());
-		message.setTimeSend(TimeUtils.sk_time_current_time());
+		message.setTimeSend(CalendarUtil.getSecondMillion());
 		message.setType(type);
 		message.setContent(content);
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/ChatMessageDao.java

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.db.dao;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.common.data.CalendarUtil;
 import com.j256.ormlite.android.DatabaseTableConfigUtil;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
@@ -15,7 +16,6 @@ import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
 import com.xzjmyk.pm.activity.db.UnlimitDaoManager;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -160,7 +160,7 @@ public class ChatMessageDao {
         UpdateBuilder<ChatMessage, Integer> builder = dao.updateBuilder();
         try {
             builder.updateColumnValue("messageState", messageState);
-            builder.updateColumnValue("timeReceive", TimeUtils.sk_time_current_time());
+            builder.updateColumnValue("timeReceive", CalendarUtil.getSecondMillion());
             builder.where().idEq(msg_id);
             dao.update(builder.prepare());
         } catch (SQLException e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/CircleMessageDao.java

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.db.dao;
 import android.os.Handler;
 import android.text.TextUtils;
 
+import com.common.thread.ThreadManager;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.Dao;
@@ -11,10 +12,9 @@ import com.j256.ormlite.dao.GenericRawResults;
 import com.j256.ormlite.stmt.DeleteBuilder;
 import com.j256.ormlite.stmt.PreparedQuery;
 import com.j256.ormlite.stmt.QueryBuilder;
-import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
 import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
-import com.xzjmyk.pm.activity.util.ThreadManager;
 
 import java.sql.SQLException;
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -5,6 +5,7 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.common.data.CalendarUtil;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.Dao.CreateOrUpdateStatus;
@@ -27,7 +28,6 @@ import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
 import com.xzjmyk.pm.activity.sp.TableVersionSp;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
 
 import java.sql.SQLException;
@@ -104,7 +104,7 @@ public class FriendDao {
 //				chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
 //				chatMessage.setFromUserId(Friend.ID_NEW_FRIEND_MESSAGE);
 //				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
-//				chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
+//				chatMessage.setTimeSend(CalendarUtil.getSecondMillion());
 //				chatMessage.setContent("");
 //				chatMessage.setMySend(false);// 表示不是自己发的
 //				// 更新消息记录
@@ -125,7 +125,7 @@ public class FriendDao {
 //				chatMessage.setFromUserId(Friend.ID_SYSTEM_MESSAGE);
 //				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 //				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-//				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 1);
+//				chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 1);
 //				chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
 //				chatMessage.setMySend(false);// 表示不是自己发的
 //				// 往消息表里插入一条记录
@@ -168,7 +168,7 @@ public class FriendDao {
                 chatMessage.setFromUserId(Friend.ID_ERP_PROCESS);
                 chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
                 // 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-                chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 7);
+                chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 7);
                 chatMessage.setContent("暂无新审批流！");
                 chatMessage.setMySend(false);// 表示不是自己发的
                 // 往消息表里插入一条记录
@@ -192,7 +192,7 @@ public class FriendDao {
                 chatMessage.setFromUserId(Friend.ID_ERP_TASK);
                 chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
                 // 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-                chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 6);
+                chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 6);
                 chatMessage.setContent("暂无新任务！");
                 chatMessage.setMySend(false);// 表示不是自己发的
                 // 往消息表里插入一条记录
@@ -215,7 +215,7 @@ public class FriendDao {
                 chatMessage.setFromUserId(Friend.ID_ERP_ZHIHUI);
                 chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
                 // 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-                chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 5);
+                chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 5);
                 chatMessage.setContent("暂无新消息！");
                 chatMessage.setMySend(false);// 表示不是自己发的
                 // 往消息表里插入一条记录
@@ -239,7 +239,7 @@ public class FriendDao {
 //				chatMessage.setFromUserId(Friend.ID_ERP_NEWS);
 //				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 //				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-//				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 2);
+//				chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 2);
 //				chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
 //				chatMessage.setMySend(false);// 表示不是自己发的
 //				// 往消息表里插入一条记录
@@ -262,7 +262,7 @@ public class FriendDao {
 			chatMessage.setFromUserId(Friend.ID_ERP_NOTICE);
 			chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 			// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-			chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 3);
+			chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 3);
 			chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
 			chatMessage.setMySend(false);// 表示不是自己发的
 			// 往消息表里插入一条记录
@@ -285,7 +285,7 @@ public class FriendDao {
 				chatMessage.setFromUserId(Friend.ID_ERP_GONGGAO);
 				chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
 				// 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-				chatMessage.setTimeSend(TimeUtils.sk_time_current_time() + 4);
+				chatMessage.setTimeSend(CalendarUtil.getSecondMillion() + 4);
 				chatMessage.setContent(MyApplication.getInstance().getString(R.string.welcome_user_software));
 				chatMessage.setMySend(false);// 表示不是自己发的
 				// 往消息表里插入一条记录
@@ -465,7 +465,7 @@ public class FriendDao {
         chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
         chatMessage.setFromUserId(friendId);
         chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
-        chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
+        chatMessage.setTimeSend(CalendarUtil.getSecondMillion());
         chatMessage.setContent(MyApplication.getInstance().getString(R.string.friend_to_chat));
         chatMessage.setMySend(false);// 表示不是自己发的
         // 往消息表里插入一条记录
@@ -691,7 +691,7 @@ public class FriendDao {
                 existFriend.setOwnerId(newFriend.getOwnerId());
                 existFriend.setUserId(newFriend.getUserId());
                 existFriend.setNickName(newFriend.getNickName());
-                existFriend.setTimeCreate(TimeUtils.sk_time_current_time());
+                existFriend.setTimeCreate(CalendarUtil.getSecondMillion());
                 existFriend.setCompanyId(newFriend.getCompanyId());// 可能是公司，这个需要设置
                 existFriend.setVersion(TableVersionSp.getInstance(MyApplication.getInstance()).getFriendTableVersion(newFriend.getOwnerId()));
             }
@@ -1122,7 +1122,7 @@ public class FriendDao {
                         friend.setRoomId(mucRoom.getId());
                         friend.setRoomCreateUserId(mucRoom.getSubject());
                         // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-                        // friend.setTimeSend(TimeUtils.sk_time_current_time());
+                        // friend.setTimeSend(CalendarUtil.getSecondMillion());
                         friend.setStatus(Friend.STATUS_FRIEND);
                         friend.setVersion(newVersion);// 更新版本
                         MucRoomMember memberMy = mucRoom.getMember();

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/WorkLocationDao.java

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.xzjmyk.pm.activity.util.MessageDialogUtil.show;
+import static com.xzjmyk.pm.activity.util.dialog.MessageDialogUtil.show;
 
 /**
  * Created by Bitliker on 2017/2/9.

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

@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.CalendarUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.AttentionUser;
 import com.xzjmyk.pm.activity.bean.Friend;
@@ -15,7 +16,6 @@ import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.sp.TableVersionSp;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -48,7 +48,7 @@ public class FriendHelper {
             if (friend == null) {// 本地不存在关系，那么就要插入一条好友记录
                 friend = new Friend();
                 friend.setTimeCreate(attentionUser.getCreateTime());
-                friend.setTimeSend(TimeUtils.sk_time_current_time());
+                friend.setTimeSend(CalendarUtil.getSecondMillion());
                 friend.setOwnerId(attentionUser.getUserId());
                 friend.setUserId(attentionUser.getToUserId());
                 friend.setNickName(attentionUser.getToNickName());

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

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
+import com.common.ui.ImageUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
@@ -12,7 +13,6 @@ import com.xzjmyk.pm.activity.bean.UploadFileResult;
 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.util.ImageUtil;
 import com.xzjmyk.pm.activity.volley.Result;
 
 import org.apache.http.Header;

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

@@ -79,9 +79,8 @@ import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
-import com.xzjmyk.pm.activity.util.Constants;
-import com.xzjmyk.pm.activity.util.QSearchPpwindowUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.im.Constants;
+import com.xzjmyk.pm.activity.util.dialog.QSearchPpwindowUtils;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -1023,7 +1022,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 
         String off_time = models.get(models.size() - 1).getOffTime();
         if (StringUtils.isEmpty(off_time)) return;
-        String cur_time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        String cur_time = DateFormatUtil.long2Str(System.currentTimeMillis(), "HH:mm");
         if (cur_time.compareTo(off_time) > 0) {
             new Handler().postDelayed(new Runnable() { // 下班时间
                 @Override

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

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.Md5Util;
+import com.common.ui.ProgressDialogUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
@@ -29,7 +30,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;

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

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.Md5Util;
+import com.common.ui.ProgressDialogUtil;
 import com.common.system.SystemUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -29,7 +30,6 @@ import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.ActivityStack;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterActivity.java

@@ -14,13 +14,14 @@ import android.widget.EditText;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.StringUtil;
+import com.common.data.CalendarUtil;
+import com.common.ui.ProgressDialogUtil;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.AuthCode;
 import com.xzjmyk.pm.activity.db.dao.AuthCodeDao;
-import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -31,266 +32,260 @@ import java.util.Map;
 
 /**
  * 注册的第一个页面（1、输入手机号）
- * 
+ *
  * @author Dean Tao
  * @version 1.0
  */
 public class RegisterActivity extends BaseActivity {
-	public static final String EXTRA_AUTH_CODE = "auth_code";
-	public static final String EXTRA_PHONE_NUMBER = "phone_number";
-	public static final String EXTRA_PASSWORD = "password";
+    public static final String EXTRA_AUTH_CODE = "auth_code";
+    public static final String EXTRA_PHONE_NUMBER = "phone_number";
+    public static final String EXTRA_PASSWORD = "password";
 
-	private EditText mPhoneNumEdit;
-	private EditText mAuthCodeEdit;
-	private Button mSendAgainBtn;
-	private Button mNextStepBtn;
+    private EditText mPhoneNumEdit;
+    private EditText mAuthCodeEdit;
+    private Button mSendAgainBtn;
+    private Button mNextStepBtn;
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_register);
-		getSupportActionBar().setTitle(R.string.register_step_one);
-		initView();
-	}
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_register);
+        getSupportActionBar().setTitle(R.string.register_step_one);
+        initView();
+    }
 
-	private void initView() {
-		mPhoneNumEdit = (EditText) findViewById(R.id.phone_numer_edit);
-		mAuthCodeEdit = (EditText) findViewById(R.id.auth_code_edit);
-		mSendAgainBtn = (Button) findViewById(R.id.send_again_btn);
-		mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
+    private void initView() {
+        mPhoneNumEdit = (EditText) findViewById(R.id.phone_numer_edit);
+        mAuthCodeEdit = (EditText) findViewById(R.id.auth_code_edit);
+        mSendAgainBtn = (Button) findViewById(R.id.send_again_btn);
+        mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
 
-		mSendAgainBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				String phoneNumber = mPhoneNumEdit.getText().toString().trim();
-				if (TextUtils.isEmpty(phoneNumber)) {
-					return;
-				}
-				if (!StringUtils.isMobileNumber(phoneNumber)) {
-					mPhoneNumEdit.requestFocus();
-					mPhoneNumEdit.setError(StringUtils.editTextHtmlErrorTip(
-							mContext, R.string.phone_number_format_error));
-					return;
-				}
+        mSendAgainBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String phoneNumber = mPhoneNumEdit.getText().toString().trim();
+                if (TextUtils.isEmpty(phoneNumber)) {
+                    return;
+                }
+                if (!StringUtil.isMobileNumber(phoneNumber)) {
+                    mPhoneNumEdit.requestFocus();
+                    mPhoneNumEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.phone_number_format_error));
+                    return;
+                }
 
-				verifyTelephone(phoneNumber);
-			}
-		});
+                verifyTelephone(phoneNumber);
+            }
+        });
 
-		mNextStepBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				// 验证码先屏蔽了
-				// nextStep();
-				final String phoneNumber = mPhoneNumEdit.getText().toString()
-						.trim();
-				if (phoneNumber.isEmpty()) {
-					ToastUtil.showToast(mContext, "手机号码不能为空");
-				} else {
-					Intent intent = new Intent(RegisterActivity.this,
-							RegisterPasswordActivity.class);
-					intent.putExtra(RegisterActivity.EXTRA_PHONE_NUMBER,
-							phoneNumber);
-					startActivity(intent);
-					finish();
-				}
-			}
-		});
-	}
+        mNextStepBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // 验证码先屏蔽了
+                // nextStep();
+                final String phoneNumber = mPhoneNumEdit.getText().toString()
+                        .trim();
+                if (phoneNumber.isEmpty()) {
+                    ToastUtil.showToast(mContext, "手机号码不能为空");
+                } else {
+                    Intent intent = new Intent(RegisterActivity.this,
+                            RegisterPasswordActivity.class);
+                    intent.putExtra(RegisterActivity.EXTRA_PHONE_NUMBER,
+                            phoneNumber);
+                    startActivity(intent);
+                    finish();
+                }
+            }
+        });
+    }
 
-	/* 验证该号码有没有注册 */
-	private void verifyTelephone(final String phoneNumber) {
-		Map<String, String> params = new HashMap<String, String>();
-		params.put("telephone", phoneNumber);
+    /* 验证该号码有没有注册 */
+    private void verifyTelephone(final String phoneNumber) {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("telephone", phoneNumber);
 
-		final String requestTag = "verifyTelephone";
-		final ProgressDialog dialog = ProgressDialogUtil.init(mContext, null,
-				getString(R.string.please_wait), true);
-		dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-			@Override
-			public void onCancel(DialogInterface dialog) {
-				cancelAll(requestTag);
-			}
-		});
-		ProgressDialogUtil.show(dialog);
+        final String requestTag = "verifyTelephone";
+        final ProgressDialog dialog = ProgressDialogUtil.init(mContext, null,
+                getString(R.string.please_wait), true);
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialog) {
+                cancelAll(requestTag);
+            }
+        });
+        ProgressDialogUtil.show(dialog);
 
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(
-				mConfig.VERIFY_TELEPHONE, new Response.ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						Log.e("error", "网络不通");
-						ToastUtil.showErrorNet(RegisterActivity.this);
-						ProgressDialogUtil.dismiss(dialog);
-					}
-				}, new StringJsonObjectRequest.Listener<Void>() {
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(
+                mConfig.VERIFY_TELEPHONE, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                Log.e("error", "网络不通");
+                ToastUtil.showErrorNet(RegisterActivity.this);
+                ProgressDialogUtil.dismiss(dialog);
+            }
+        }, new StringJsonObjectRequest.Listener<Void>() {
 
-					@Override
-					public void onResponse(ObjectResult<Void> result) {
-						ProgressDialogUtil.dismiss(dialog);
-						if (result == null) {
-							ToastUtil.showToast(RegisterActivity.this,
-									R.string.data_exception);
-							return;
-						}
-						if (result.getResultCode() == 1) {// 手机号没有被注册,那么就发送验证码
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                ProgressDialogUtil.dismiss(dialog);
+                if (result == null) {
+                    ToastUtil.showToast(RegisterActivity.this,
+                            R.string.data_exception);
+                    return;
+                }
+                if (result.getResultCode() == 1) {// 手机号没有被注册,那么就发送验证码
 
-							mSendAgainBtn.setEnabled(false);
-							mReckonHandler.sendEmptyMessage(0x1);
-							sendAuthcode(phoneNumber);
+                    mSendAgainBtn.setEnabled(false);
+                    mReckonHandler.sendEmptyMessage(0x1);
+                    sendAuthcode(phoneNumber);
 
-						} else if (result.getResultCode() == 0) {// 手机号已经被注册
-							if (!TextUtils.isEmpty(result.getResultMsg())) {
-								ToastUtil.showToast(RegisterActivity.this,
-										result.getResultMsg());
-							} else {
-								ToastUtil.showToast(RegisterActivity.this,
-										R.string.telphone_already_rigister);
-							}
-						} else {// 错误
-							if (!TextUtils.isEmpty(result.getResultMsg())) {
-								ToastUtil.showToast(RegisterActivity.this,
-										result.getResultMsg());
-							} else {
-								ToastUtil.showToast(RegisterActivity.this,
-										R.string.data_exception);
-							}
-						}
-					}
-				}, Void.class, params);
-		request.setTag(requestTag);
-		addDefaultRequest(request);
-	}
+                } else if (result.getResultCode() == 0) {// 手机号已经被注册
+                    if (!TextUtils.isEmpty(result.getResultMsg())) {
+                        ToastUtil.showToast(RegisterActivity.this,
+                                result.getResultMsg());
+                    } else {
+                        ToastUtil.showToast(RegisterActivity.this,
+                                R.string.telphone_already_rigister);
+                    }
+                } else {// 错误
+                    if (!TextUtils.isEmpty(result.getResultMsg())) {
+                        ToastUtil.showToast(RegisterActivity.this,
+                                result.getResultMsg());
+                    } else {
+                        ToastUtil.showToast(RegisterActivity.this,
+                                R.string.data_exception);
+                    }
+                }
+            }
+        }, Void.class, params);
+        request.setTag(requestTag);
+        addDefaultRequest(request);
+    }
 
-	/**
-	 * 是否请求了验证码
-	 * 
-	 * @return
-	 */
-	private void sendAuthcode(final String phoneNumber) {
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("telephone", phoneNumber);
-		params.put("token", "abcdefg");// 无效的参数。
+    /**
+     * 是否请求了验证码
+     *
+     * @return
+     */
+    private void sendAuthcode(final String phoneNumber) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("telephone", phoneNumber);
+        params.put("token", "abcdefg");// 无效的参数。
 
-		StringJsonObjectRequest<AuthCode> request = new StringJsonObjectRequest<AuthCode>(
-				mConfig.SEND_AUTH_CODE, new Response.ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						// 发送失败，使其能重新发送
-						ToastUtil.showToast(mContext,
-								R.string.get_auth_code_failed);
-						mReckonHandler.removeCallbacksAndMessages(null);
-						mReckonHandler.sendEmptyMessage(0x2);
-					}
-				}, new StringJsonObjectRequest.Listener<AuthCode>() {
-					@Override
-					public void onResponse(ObjectResult<AuthCode> result) {
-						if (result != null && result.getResultCode() == 1) {// 发送成功
-							if (result.getData() != null) {
-								AuthCode authCode = result.getData();
-								authCode.setPhoneNumber(phoneNumber);
-								// 过期时间为收到验证码之后的两分钟
-								authCode.setOverdueTime(TimeUtils
-										.sk_time_current_time() + 2 * 60);
-								AuthCodeDao.getInstance()
-										.saveAuthCode(authCode);
-							} else {
-								mReckonHandler.removeCallbacksAndMessages(null);
-								mReckonHandler.sendEmptyMessage(0x2);
-								ToastUtil.showToast(mContext,
-										R.string.get_auth_code_failed);
-							}
-						} else {
-							mReckonHandler.removeCallbacksAndMessages(null);
-							mReckonHandler.sendEmptyMessage(0x2);
-							ToastUtil.showToast(mContext, result.getResultMsg());
-						}
-					}
-				}, AuthCode.class, params);
-		addDefaultRequest(request);
-	}
+        StringJsonObjectRequest<AuthCode> request = new StringJsonObjectRequest<AuthCode>(
+                mConfig.SEND_AUTH_CODE, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                // 发送失败，使其能重新发送
+                ToastUtil.showToast(mContext,
+                        R.string.get_auth_code_failed);
+                mReckonHandler.removeCallbacksAndMessages(null);
+                mReckonHandler.sendEmptyMessage(0x2);
+            }
+        }, new StringJsonObjectRequest.Listener<AuthCode>() {
+            @Override
+            public void onResponse(ObjectResult<AuthCode> result) {
+                if (result != null && result.getResultCode() == 1) {// 发送成功
+                    if (result.getData() != null) {
+                        AuthCode authCode = result.getData();
+                        authCode.setPhoneNumber(phoneNumber);
+                        // 过期时间为收到验证码之后的两分钟
+                        authCode.setOverdueTime(CalendarUtil.getSecondMillion() + 2 * 60);
+                        AuthCodeDao.getInstance()
+                                .saveAuthCode(authCode);
+                    } else {
+                        mReckonHandler.removeCallbacksAndMessages(null);
+                        mReckonHandler.sendEmptyMessage(0x2);
+                        ToastUtil.showToast(mContext,
+                                R.string.get_auth_code_failed);
+                    }
+                } else {
+                    mReckonHandler.removeCallbacksAndMessages(null);
+                    mReckonHandler.sendEmptyMessage(0x2);
+                    ToastUtil.showToast(mContext, result.getResultMsg());
+                }
+            }
+        }, AuthCode.class, params);
+        addDefaultRequest(request);
+    }
 
-	private int reckonTime = 60;
-	private Handler mReckonHandler = new Handler() {
-		public void handleMessage(Message msg) {
-			if (msg.what == 0x1) {
-				mSendAgainBtn.setText("(" + reckonTime + ")");
-				reckonTime--;
-				if (reckonTime < 0) {
-					mReckonHandler.sendEmptyMessage(0x2);
-				} else {
-					mReckonHandler.sendEmptyMessageDelayed(0x1, 1000);
-				}
-			} else if (msg.what == 0x2) {// 60秒结束
-				mSendAgainBtn.setText(R.string.send);
-				mSendAgainBtn.setEnabled(true);
-				reckonTime = 60;
-			}
-		}
-	};
+    private int reckonTime = 60;
+    private Handler mReckonHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            if (msg.what == 0x1) {
+                mSendAgainBtn.setText("(" + reckonTime + ")");
+                reckonTime--;
+                if (reckonTime < 0) {
+                    mReckonHandler.sendEmptyMessage(0x2);
+                } else {
+                    mReckonHandler.sendEmptyMessageDelayed(0x1, 1000);
+                }
+            } else if (msg.what == 0x2) {// 60秒结束
+                mSendAgainBtn.setText(R.string.send);
+                mSendAgainBtn.setEnabled(true);
+                reckonTime = 60;
+            }
+        }
+    };
 
-	private void nextStep() {
-		final String phoneNumber = mPhoneNumEdit.getText().toString().trim();
-		if (TextUtils.isEmpty(phoneNumber)) {
-			return;
-		}
+    private void nextStep() {
+        final String phoneNumber = mPhoneNumEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(phoneNumber)) {
+            return;
+        }
 
-		if (!StringUtils.isMobileNumber(phoneNumber)) {
-			mPhoneNumEdit.requestFocus();
-			mPhoneNumEdit.setError(StringUtils.editTextHtmlErrorTip(this,
-					R.string.phone_number_format_error));
-			return;
-		}
+        if (!StringUtil.isMobileNumber(phoneNumber)) {
+            mPhoneNumEdit.requestFocus();
+            mPhoneNumEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.phone_number_format_error));
+            return;
+        }
 
-		// TODO 打开下面注释
-		String authCode = mAuthCodeEdit.getText().toString().trim();
-		if (TextUtils.isEmpty(authCode)) {
-			// mAuthCodeEdit.requestFocus();
-			// mAuthCodeEdit.setError(Utils.editTextHtmlErrorTip(this,
-			// "请填写验证码"));
-			return;
-		}
+        // TODO 打开下面注释
+        String authCode = mAuthCodeEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(authCode)) {
+            // mAuthCodeEdit.requestFocus();
+            // mAuthCodeEdit.setError(Utils.editTextHtmlErrorTip(this,
+            // "请填写验证码"));
+            return;
+        }
 
-		List<AuthCode> codesInDb = AuthCodeDao.getInstance().getAuthCode(
-				phoneNumber);
-		if (codesInDb == null || codesInDb.size() <= 0) {
-			mAuthCodeEdit.requestFocus();
-			mAuthCodeEdit.setError(StringUtils.editTextHtmlErrorTip(this,
-					R.string.auth_code_error));
-			return;
-		}
+        List<AuthCode> codesInDb = AuthCodeDao.getInstance().getAuthCode(
+                phoneNumber);
+        if (codesInDb == null || codesInDb.size() <= 0) {
+            mAuthCodeEdit.requestFocus();
+            mAuthCodeEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.auth_code_error));
+            return;
+        }
 
-		boolean match = false;
-		int overdueTime = 0;
-		for (int i = 0; i < codesInDb.size(); i++) {
-			if (authCode.equals(codesInDb.get(i).getRandcode())) {
-				match = true;
-				overdueTime = codesInDb.get(i).getOverdueTime();
-				break;
-			}
-		}
+        boolean match = false;
+        int overdueTime = 0;
+        for (int i = 0; i < codesInDb.size(); i++) {
+            if (authCode.equals(codesInDb.get(i).getRandcode())) {
+                match = true;
+                overdueTime = codesInDb.get(i).getOverdueTime();
+                break;
+            }
+        }
 
-		if (!match) {
-			mAuthCodeEdit.requestFocus();
-			mAuthCodeEdit.setError(StringUtils.editTextHtmlErrorTip(this,
-					R.string.auth_code_error));
-			return;
-		}
+        if (!match) {
+            mAuthCodeEdit.requestFocus();
+            mAuthCodeEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.auth_code_error));
+            return;
+        }
 
-		if (overdueTime < TimeUtils.sk_time_current_time()) {// 过期了
-			mAuthCodeEdit.requestFocus();
-			mAuthCodeEdit.setError(StringUtils.editTextHtmlErrorTip(this,
-					R.string.auth_code_overdue));
-			return;
-		}
+        if (overdueTime < CalendarUtil.getSecondMillion()) {// 过期了
+            mAuthCodeEdit.requestFocus();
+            mAuthCodeEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.auth_code_overdue));
+            return;
+        }
 
-		// 验证码匹配成功，清除数据库的所有该手机的验证码
-		AuthCodeDao.getInstance().clearAuthCode(phoneNumber);
+        // 验证码匹配成功，清除数据库的所有该手机的验证码
+        AuthCodeDao.getInstance().clearAuthCode(phoneNumber);
 
-		Intent intent = new Intent(this, RegisterPasswordActivity.class);
-		intent.putExtra(RegisterActivity.EXTRA_PHONE_NUMBER, phoneNumber);
-		startActivity(intent);
-		finish();
+        Intent intent = new Intent(this, RegisterPasswordActivity.class);
+        intent.putExtra(RegisterActivity.EXTRA_PHONE_NUMBER, phoneNumber);
+        startActivity(intent);
+        finish();
 
-	}
+    }
 
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterPasswordActivity.java

@@ -10,9 +10,9 @@ import android.widget.Button;
 import android.widget.EditText;
 
 import com.common.Md5Util;
+import com.common.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.util.StringUtils;
 
 /**
  * 注册输入密码界面
@@ -57,17 +57,17 @@ public class RegisterPasswordActivity extends ActionBackActivity {
 		String confirmPassword = mConfirmPasswordEdit.getText().toString().trim();
 		if (TextUtils.isEmpty(password) || password.length() < 6) {
 			mPasswordEdit.requestFocus();
-			mPasswordEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.password_empty_error));
+			mPasswordEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.password_empty_error));
 			return;
 		}
 		if (TextUtils.isEmpty(confirmPassword) || confirmPassword.length() < 6) {
 			mConfirmPasswordEdit.requestFocus();
-			mConfirmPasswordEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.confirm_password_empty_error));
+			mConfirmPasswordEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.confirm_password_empty_error));
 			return;
 		}
 		if (!confirmPassword.equals(password)) {
 			mConfirmPasswordEdit.requestFocus();
-			mConfirmPasswordEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.password_confirm_password_not_match));
+			mConfirmPasswordEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.password_confirm_password_not_match));
 			return;
 		}
 

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

@@ -19,7 +19,12 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.StringUtil;
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.common.system.SystemUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
@@ -32,8 +37,6 @@ import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -105,13 +108,13 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 	private void updateUI() {
 		mTempData = new User();
 		mTempData.setSex(1);
-		mTempData.setBirthday(TimeUtils.sk_time_current_time());
+		mTempData.setBirthday(CalendarUtil.getSecondMillion());
 		if (mTempData.getSex() == 1) {
 			mSexTv.setText(R.string.sex_man);
 		} else {
 			mSexTv.setText(R.string.sex_woman);
 		}
-		mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
+		mBirthdayTv.setText(DateFormatUtil.long2Str(mTempData.getBirthday()*1000,DateFormatUtil.YMD));
 	}
 
 	@Override
@@ -163,7 +166,7 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 	private Uri mNewPhotoUri;
 
 	private void takePhoto() {
-		mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+		mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
 		CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_CROP_PHOTO);
 	}
 
@@ -177,7 +180,7 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 			if (resultCode == Activity.RESULT_OK) {
 				if (mNewPhotoUri != null) {
 					Uri o = mNewPhotoUri;
-					mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+					mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
 					CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
 				} else {
 					ToastUtil.showToast(this, R.string.c_photo_album_failed);
@@ -188,7 +191,7 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 				if (data != null && data.getData() != null) {
 					String path = CameraUtil.getImagePathFromUri(this, data.getData());
 					Uri o = Uri.fromFile(new File(path));
-					mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+					mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
 					CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
 				} else {
 					ToastUtil.showToast(this, R.string.c_photo_album_failed);
@@ -271,12 +274,12 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 
 		if (TextUtils.isEmpty(mTempData.getNickName())) {
 			mNameEdit.requestFocus();
-			mNameEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.name_empty_error));
+			mNameEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.name_empty_error));
 			return;
 		}
 		if (!StringUtils.isNickName(mTempData.getNickName())) {
 			mNameEdit.requestFocus();
-			mNameEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.nick_name_format_error));
+			mNameEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.nick_name_format_error));
 			return;
 		}
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -21,7 +21,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 

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

@@ -17,15 +17,16 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
 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.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
@@ -36,7 +37,6 @@ import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.xzjmyk.pm.activity.sortlist.SideBar;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;

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

@@ -19,36 +19,36 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.sortlist.BaseComparator;
-import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
 import com.xzjmyk.pm.activity.bean.AttentionUser;
 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.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.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.xzjmyk.pm.activity.ui.base.EasyFragment;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;

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

@@ -14,10 +14,10 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -25,13 +25,13 @@ import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
 import com.xzjmyk.pm.activity.bean.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.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.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;

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

@@ -36,9 +36,11 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.StringUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -66,7 +68,6 @@ import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
@@ -655,7 +656,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     private void doPhone(String phone) {
-        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
+        if (!StringUtil.isMobileNumber(phone)) {
             ToastUtil.showToast(ct, R.string.phone_number_format_error);
             return;
         }

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

@@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.CameraUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -53,7 +54,6 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
@@ -619,7 +619,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                 if (data != null && data.getData() != null) {
                     String path = CameraUtil.getImagePathFromUri(this, data.getData());
                     Uri o = Uri.fromFile(new File(path));
-                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
                 } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/CircleAudioRecordActivity.java

@@ -14,14 +14,15 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.common.ui.CameraUtil;
 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.audio.AudioPalyer;
 import com.xzjmyk.pm.activity.audio.RecordController;
 import com.xzjmyk.pm.activity.audio.RecordListener;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.io.File;
@@ -300,7 +301,7 @@ public class CircleAudioRecordActivity extends ActionBackActivity implements Vie
 	private Uri mNewPhotoUri;
 
 	private void takePhoto() {
-		mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+		mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
 		CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
 	}
 

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

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.CalendarUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -297,7 +298,7 @@ public class PMsgDetailActivity extends BaseActivity {
 				comment.setBody(text);
 				comment.setUserId(mLoginUserId);
 				comment.setNickName(mLoginNickName);
-				comment.setTime(TimeUtils.sk_time_current_time());
+				comment.setTime(CalendarUtil.getSecondMillion());
 				if (mCommentReplyCache != null) {
 					comment.setToUserId(mCommentReplyCache.toUserId);
 					comment.setToNickname(mCommentReplyCache.toNickName);

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

@@ -30,6 +30,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.CameraUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -55,7 +56,6 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
@@ -632,7 +632,7 @@ public class PersonalQzoneActivity extends BaseActivity implements showCEView {
                 if (data != null && data.getData() != null) {
                     String path = CameraUtil.getImagePathFromUri(this, data.getData());
                     Uri o = Uri.fromFile(new File(path));
-                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
                 } else {

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

@@ -17,6 +17,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
 import com.common.system.SystemUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -28,7 +29,6 @@ import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;

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

@@ -28,8 +28,11 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.mapapi.search.core.PoiInfo;
+import com.common.StringUtil;
 import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -42,9 +45,6 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -268,7 +268,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(mContext, CameraUtil.MEDIA_TYPE_IMAGE);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(mContext, MyApplication.getInstance().mLoginUser.getUserId(),CameraUtil.MEDIA_TYPE_IMAGE);
         LogUtil.d("uri:" + mNewPhotoUri);
         if (mNewPhotoUri != null) {
             CameraUtil.captureImage(SendShuoshuoActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
@@ -385,7 +385,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         String name = MyApplication.getInstance().getBdLocationHelper().getName();
         String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
         String location = MyApplication.getInstance().getBdLocationHelper().getName();
-        baseAddr = StringUtils.isEmail(name) ? address : name;
+        baseAddr = StringUtil.isEmail(name) ? address : name;
 
         Log.i("flhname", name);
         Log.i("flhaddress", address);
@@ -464,7 +464,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
             case R.id.location_rl:
                 String name = MyApplication.getInstance().getBdLocationHelper().getName();
                 String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
-                baseAddr = StringUtils.isEmail(name) ? address : name;
+                baseAddr = StringUtil.isEmail(name) ? address : name;
 
                 Intent i = new Intent(activity, LocationMapActivity.class);
                 i.putExtra("qzoneaddr", baseAddr == null ? "" : baseAddr);

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

@@ -24,8 +24,11 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.mapapi.search.core.PoiInfo;
+import com.common.StringUtil;
 import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -39,11 +42,8 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
-import com.xzjmyk.pm.activity.util.BitmapUtil;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.util.imageloader.BitmapUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -135,7 +135,7 @@ public class SendVideoActivity extends BaseActivity {
             public void onClick(View v) {
                 String name = MyApplication.getInstance().getBdLocationHelper().getName();
                 String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
-                baseAddr = StringUtils.isEmail(name) ? address : name;
+                baseAddr = StringUtil.isEmail(name) ? address : name;
                 Intent i = new Intent(activity, LocationMapActivity.class);
                 i.putExtra("qzoneaddr", baseAddr == null ? "" : baseAddr);
                 i.putExtra("qzone_select_add", "qzone_select_add");
@@ -267,7 +267,7 @@ public class SendVideoActivity extends BaseActivity {
             }
 
             // 保存视频缩略图至sd卡
-            String imageSavePsth = CameraUtil.getOutputMediaFileUri(SendVideoActivity.this, CameraUtil.MEDIA_TYPE_IMAGE).getPath();
+            String imageSavePsth = CameraUtil.getOutputMediaFileUri(SendVideoActivity.this, MyApplication.getInstance().mLoginUser.getUserId(),CameraUtil.MEDIA_TYPE_IMAGE).getPath();
             if (!BitmapUtil.saveBitmapToSDCard(mThumbBmp, imageSavePsth)) {// 保存缩略图失败
                 return 3;
             }
@@ -383,7 +383,7 @@ public class SendVideoActivity extends BaseActivity {
         String name = MyApplication.getInstance().getBdLocationHelper().getName();
         String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
         String location = MyApplication.getInstance().getBdLocationHelper().getName();
-        baseAddr = StringUtils.isEmail(name) ? address : name;
+        baseAddr = StringUtil.isEmail(name) ? address : name;
 
         // 是否显示定位
 //        if (mlocationtv.getText().equals("不显示位置")){

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

@@ -35,8 +35,10 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.StringUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
@@ -59,7 +61,6 @@ 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;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
@@ -572,7 +573,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         dialog.show();
     }
     private void doPhone(String phone) {
-        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
+        if (!StringUtil.isMobileNumber(phone)) {
             ToastUtil.showToast(ct, R.string.phone_number_format_error);
             return;
         }

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

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -47,7 +48,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 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.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ArrayResult;

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

@@ -19,6 +19,9 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -48,8 +51,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.me.BasicInfoEditActivity;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
@@ -169,7 +170,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             mSex = getString(R.string.user_girl);
             //  rbGrid.setChecked(true);
         }
-        tv_birthday.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
+        tv_birthday.setText(DateFormatUtil.long2Str(mTempData.getBirthday()*1000,DateFormatUtil.YMD));
         //查询数据库
         DBManager dbManager = new DBManager();
         String userId = mUser.getUserId();
@@ -365,7 +366,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     private Uri mNewPhotoUri;
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(),CameraUtil.MEDIA_TYPE_IMAGE);
         CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_CROP_PHOTO);
     }
 
@@ -381,7 +382,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     Uri o = mNewPhotoUri;
-                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(),CameraUtil.MEDIA_TYPE_IMAGE);
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
                 } else {
@@ -393,7 +394,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                 if (data != null && data.getData() != null) {
                     String path = CameraUtil.getImagePathFromUri(this, data.getData());
                     Uri o = Uri.fromFile(new File(path));
-                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
                 } else {

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

@@ -31,6 +31,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.CalendarUtil;
 import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -56,7 +57,6 @@ import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout;
 
 import java.text.ParseException;
@@ -638,7 +638,7 @@ public class CompanyContactsActivity extends BaseActivity  {
         friend.setNickName(item.tv_name.getText().toString());//昵称
         friend.setDescription("企业通讯录人员");
         // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-        friend.setTimeSend(TimeUtils.sk_time_current_time());
+        friend.setTimeSend(CalendarUtil.getSecondMillion());
         friend.setStatus(Friend.STATUS_FRIEND);
         if (friendOne == null) {
             FriendDao.getInstance().createOrUpdateFriend(friend);

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

@@ -22,6 +22,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -209,10 +210,10 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                 .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) : intent.getStringExtra("description"));
         tv_task_starttime.setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) :
                 intent.getStringExtra("tasktime"));
-//                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
+//                DateFormatUtil.long2Str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
         taskId = intent.getStringExtra("taskid");
         tv_task_endtime.setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
-                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
+                DateFormatUtil.long2Str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
         Log.i("tasktime2,endtime", intent.getStringExtra("tasktime") + "," + intent.getStringExtra("endtime"));
         String ra_taskid = intent.getStringExtra("ra_taskid");
         // String taskcode=intent.getStringExtra("taskcode");

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

@@ -12,7 +12,7 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.AllRemovedSubsAdapter;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.im.Constants;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.SubscribeManegeVpAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.BaseFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionAllFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionMyFragment;
-import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.view.NoSlideViewpager;
 
 import java.util.ArrayList;

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

@@ -577,7 +577,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         final String name = CommonUtil.getName();
         final String phone = user.getPhone().trim().replaceAll(" ", "");
         
-//        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
+//        if (!com.xzjmyk.pm.activity.util.StringUtil.isMobileNumber(phone)) {
 //            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
 //            return;
 //        }

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

@@ -51,7 +51,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
@@ -913,7 +912,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             tv_customer_lastTime.setText(time);
                             if (time.length() > 5)//容cuo
                             {
-                                int i = (int) ((System.currentTimeMillis() - TimeUtils.s_str_2_long(time)) / (60 * 1000 * 24 * 60));
+                                int i = (int) ((System.currentTimeMillis() - DateFormatUtil.str2Long(time, DateFormatUtil.YMD)) / (60 * 1000 * 24 * 60));
                                 tv_customer_days.setText(getString(R.string.length_last_gj) + i + getString(R.string.common_day));
                             }
                             ll_data_empty1.setVisibility(View.GONE);

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

@@ -13,11 +13,11 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.text.DecimalFormat;
 
@@ -113,7 +113,7 @@ public class SubsActivity extends BaseActivity {
                 holder.time.setText(time);
                 if (time.length() > 5)//容cuo
                 {
-                    int j = (int) ((System.currentTimeMillis() - TimeUtils.s_str_2_long(time)) / (60 * 1000 * 24 * 60));
+                    int j = (int) ((System.currentTimeMillis() - DateFormatUtil.str2Long(time,DateFormatUtil.YMD)) / (60 * 1000 * 24 * 60));
                     holder.day.setText("距离上次跟进" + j + "天");
                 }
             }

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

@@ -28,6 +28,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
+import com.common.StringUtil;
 import com.common.data.DateFormatUtil;
 import com.common.system.DisplayUtil;
 import com.iflytek.cloud.RecognizerResult;
@@ -444,7 +445,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             return false;
         }
         if (!isB2b && (TextUtils.isEmpty(phone_tv.getText())
-                || !com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone_tv.getText().toString()))) {
+                || !StringUtil.isMobileNumber(phone_tv.getText().toString()))) {
             ToastUtil.showToast(ct, R.string.phone_number_format_error);
             return false;
         }

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

@@ -42,7 +42,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUAS;
@@ -331,7 +330,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     Log.v("v_date_end1", v_date_end.getText().toString());
                     Log.d("currentSelectDate1", currentSelectDate);
                 } else {
-                    String currentDate = TimeUtils.long_to_yMdHm_str(System.currentTimeMillis());
+                    String currentDate = DateFormatUtil.long2Str("yyyy-MM-dd HH:mm");
                     v_date_start.setText(currentDate.substring(0, currentDate.length()));
                     v_date_end.setText(currentDate.substring(0, currentDate.length()));
                     currentSelectDate = currentDate.substring(0, 10);
@@ -1160,9 +1159,9 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             String url = Constants.IM_BASE_URL + "user/appBusytime";
             String ym;
             if (startDate) {
-                ym = DateFormatUtil.getStrDate4String(v_date_start.getText().toString().replace("-", ""), "yyyyMMdd");
+                ym = DateFormatUtil.formatChange(v_date_start.getText().toString().replace("-", ""), "yyyyMMdd");
             } else {
-                ym = DateFormatUtil.getStrDate4String(v_date_end.getText().toString().replace("-", ""), "yyyyMMdd");
+                ym = DateFormatUtil.formatChange(v_date_end.getText().toString().replace("-", ""), "yyyyMMdd");
             }
             Map<String, Object> params = new HashMap<>();
             params.put("token", MyApplication.getInstance().mAccessToken);

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

@@ -27,6 +27,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.ui.CameraUtil;
+import com.common.ui.ImageUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.system.SystemUtil;
 import com.lidroid.xutils.HttpUtils;
@@ -53,9 +56,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ImageUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
@@ -326,7 +326,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
         CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
     }
 

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

@@ -15,6 +15,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
 import com.common.Md5Util;
+import com.common.data.CalendarUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -24,7 +25,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
@@ -175,7 +175,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     private void showSelectBirthdayDialog() {
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.YEAR_MONTH_DAY);
-        picker.setRange(1960, CalendarUtils.getCurrentYear());
+        picker.setRange(1960, CalendarUtil.getYear());
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {

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

@@ -15,10 +15,13 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
+import com.common.ui.CameraUtil;
+import com.common.ui.ImageUtil;
 import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
@@ -29,8 +32,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.PopupWindowHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.io.File;
@@ -98,12 +99,12 @@ public class AddContactsActivity extends BaseActivity implements View.OnClickLis
                 createImagePopWindow();
                 break;
             case R.id.head_take_picture:
-                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(ct, CameraUtil.MEDIA_TYPE_IMAGE);
+                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(ct, MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                 CameraUtil.captureImage(AddContactsActivity.this, mNewPhotoUri, CAPTURE_PHOTO);
                 cloneImagePopWindow();
                 break;
             case R.id.head_select_photos:
-                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(ct, CameraUtil.MEDIA_TYPE_IMAGE);
+                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(ct,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                 CameraUtil.pickImageSimple(AddContactsActivity.this, PICK_PHOTO);
                 cloneImagePopWindow();
                 break;

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

@@ -15,6 +15,8 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
@@ -32,7 +34,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.PopupWindowHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
@@ -108,7 +109,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
             model.setAddress(cuaddress);
             presenter.setClient(model);
             presenter.loadContact(code);
-            date_tv.setText(TimeUtils.s_long_2_str(TimeUtils.f_str_2_long(vr_recorddate)));
+            date_tv.setText(TimeUtils.s_long_2_str(DateFormatUtil.str2Long(vr_recorddate,DateFormatUtil.YMD_HMS)));
             initView(cucontact);
         }
     }
@@ -223,8 +224,8 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
     //显示时间选择器
     private void showDateDialog() {
         OASigninPicker picker = new OASigninPicker(this);
-        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
-        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setRange(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
             public void setTime(String year, String month, String day) {

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

@@ -38,8 +38,11 @@ import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.andreabaccega.widget.FormEditText;
+import com.common.StringUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ImageUtil;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -76,8 +79,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
@@ -195,7 +196,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     break;
 
                 case 0x15:
-                    if (!StringUtils.isEmail(result)){
+                    if (!StringUtil.isEmail(result)){
                         LogUtil.prinlnLongMsg("0x15result",result);
                         if (!ListUtils.isEmpty(costtypesinglebeanList)) costtypesinglebeanList.clear();
                         try {
@@ -1914,7 +1915,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     }
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
         CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
     }
     private int Max_Size = 9;

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

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.search.core.PoiInfo;
+import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -209,10 +210,10 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         name_tv.setText(entity.getMa_theme() == null ? "" : entity.getMa_theme());
         long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
         long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
-        oa_meeting_start.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
-        oa_meeting_end.setText(TimeUtils.long2str(endLongTime, "MM月dd"));
-        oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
-        oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
+        oa_meeting_start.setText(DateFormatUtil.long2Str(startLongTime, "MM月dd"));
+        oa_meeting_end.setText(DateFormatUtil.long2Str(endLongTime, "MM月dd"));
+        oa_meeting_start_date.setText(DateFormatUtil.long2Str(startLongTime, "HH:mm"));
+        oa_meeting_end_date.setText(DateFormatUtil.long2Str(endLongTime, "HH:mm"));
         if (!StringUtils.isEmpty(emname) && entity.getMa_recorder() != null
                 && !emname.equals(entity.getMa_recorder())
                 || "已结束".equals(status_tv.getText().toString().trim())) {

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

@@ -17,6 +17,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
@@ -284,10 +285,10 @@ public class MeetingActivity extends BaseActivity  {
             viewholder.oa_meeting_status_tv.setText(entities.get(i).getMa_stage());
             long startLong = TimeUtils.f_str_2_long(entities.get(i).getMa_starttime());
             long endLong = TimeUtils.f_str_2_long(entities.get(i).getMa_endtime());
-            viewholder.oa_meeting_start.setText(TimeUtils.long2str(startLong, "MM月dd日"));
-            viewholder.oa_meeting_end.setText(TimeUtils.long2str(endLong, "MM月dd日"));
-            viewholder.oa_meeting_start_date.setText(TimeUtils.long2str(startLong, "HH:mm"));
-            viewholder.oa_meeting_end_date.setText(TimeUtils.long2str(endLong, "HH:mm"));
+            viewholder.oa_meeting_start.setText(DateFormatUtil.long2Str(startLong, "MM月dd日"));
+            viewholder.oa_meeting_end.setText(DateFormatUtil.long2Str(endLong, "MM月dd日"));
+            viewholder.oa_meeting_start_date.setText(DateFormatUtil.long2Str(startLong, "HH:mm"));
+            viewholder.oa_meeting_end_date.setText(DateFormatUtil.long2Str(endLong, "HH:mm"));
             viewholder.oa_meeting_name_tv.setText(entities.get(i).getMa_theme());
             viewholder.oa_meeting_addr_tv.setText(entities.get(i).getMa_mrname());
             viewholder.oa_meeting_user_tv.setText(entities.get(i).getMa_recorder());
@@ -310,10 +311,10 @@ public class MeetingActivity extends BaseActivity  {
             viewholder.oa_meeting_status_tv.setText(entities.get(i).getMa_stage());
             long startLong = TimeUtils.f_str_2_long(entity.getMa_starttime());
             long endLong = TimeUtils.f_str_2_long(entity.getMa_endtime());
-            viewholder.oa_meeting_start.setText(TimeUtils.long2str(startLong, "MM月dd日"));
-            viewholder.oa_meeting_end.setText(TimeUtils.long2str(endLong, "MM月dd日"));
-            viewholder.oa_meeting_start_date.setText(TimeUtils.long2str(startLong, "HH:mm"));
-            viewholder.oa_meeting_end_date.setText(TimeUtils.long2str(endLong, "HH:mm"));
+            viewholder.oa_meeting_start.setText(DateFormatUtil.long2Str(startLong, "MM月dd日"));
+            viewholder.oa_meeting_end.setText(DateFormatUtil.long2Str(endLong, "MM月dd日"));
+            viewholder.oa_meeting_start_date.setText(DateFormatUtil.long2Str(startLong, "HH:mm"));
+            viewholder.oa_meeting_end_date.setText(DateFormatUtil.long2Str(endLong, "HH:mm"));
             viewholder.oa_meeting_name_tv.setText(entity.getMa_theme());
             viewholder.oa_meeting_addr_tv.setText(entity.getMa_mrname());
             viewholder.oa_meeting_user_tv.setText(entity.getMa_recorder());

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

@@ -17,6 +17,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.route.DrivingRouteLine;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
+import com.common.data.CalendarUtil;
 import com.common.preferences.PreferenceUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -38,6 +39,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.baidu.OnGetDrivingRouteResult;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.MostLinearLayoutManager;
+import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
@@ -254,13 +256,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
                 break;
             case R.id.item_reckontime_tv://预计到达时间
                 if (model == null || model.getStatus() == 1) return;
-                TimeUtils.showDateDialog(MissionActivity.this, new TimeUtils.OnSelectListener() {
-                    @Override
-                    public void callBack(String time) {
-                        adapter.getModels().get(position).setVisitTime(time);
-                        adapter.notifyItemChanged(position);
-                    }
-                });
+                showDateDialog();
                 break;
             case R.id.item_remark_tv:
                 if (model == null || model.getStatus() == 1) return;
@@ -276,6 +272,21 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
         }
     }
 
+    public void showDateDialog() {
+        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
+        picker.setRange(2010, 2030);
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay(), CalendarUtil.getMinute(), CalendarUtil.getSecond());
+        picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
+            @Override
+            public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
+                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
+                adapter.getModels().get(position).setVisitTime(time);
+                adapter.notifyItemChanged(position);
+            }
+        });
+        picker.show();
+    }
+
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {

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

@@ -25,6 +25,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.common.system.DisplayUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -197,7 +198,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
                 model.setId(object.getInteger("id"));
                 model.setTitle(object.getString("title"));
                 if (platform) {
-                    model.setTime(TimeUtils.long2str(object.getLongValue("createTime"), "yyyy-MM-dd HH:mm"));
+                    model.setTime(DateFormatUtil.long2Str(object.getLongValue("createTime"), "yyyy-MM-dd HH:mm"));
                 } else {
                     model.setTime(object.getString("createTime"));
                 }
@@ -648,7 +649,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
                 if (platform) {
                     viewHolder.msgs_time_tv.setText(msgModel.get(position).getTime());
                 } else {
-                    viewHolder.msgs_time_tv.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(msgModel.get(position).getTime()), "yyyy-MM-dd HH:mm"));
+                    viewHolder.msgs_time_tv.setText(DateFormatUtil.long2Str(TimeUtils.f_str_2_long(msgModel.get(position).getTime()), "yyyy-MM-dd HH:mm"));
                 }
             }
             viewHolder.msgs_content_tv.setText(Html.fromHtml(msgModel.get(position).getSubTitle()));

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

@@ -29,7 +29,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.OnGetRoutePlanResult;
-import com.xzjmyk.pm.activity.util.DrivingRouteOverlay;
+import com.xzjmyk.pm.activity.util.baidu.DrivingRouteOverlay;
 
 import java.io.File;
 

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

@@ -27,6 +27,8 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -243,7 +245,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == 0x20) {
-            loadNetData(TimeUtils.ym_format.format(curDate));
+            loadNetData(DateFormatUtil.date2Str(curDate,"yyyyMM") );
         } else if (requestCode == 0x11 && resultCode == 0x11) {//选择下属
             if (data == null) return;
             Employees entity = data.getParcelableExtra("data");
@@ -260,7 +262,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 setAdapterBeans(filterModels);
             }
         } else if (requestCode == 0x21) {
-            loadNetData(TimeUtils.ym_format.format(curDate));
+            loadNetData(DateFormatUtil.date2Str(curDate,"yyyyMM"));
         }
     }
 
@@ -330,7 +332,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                         intent.putExtra("endtime", object.getString("enddate"));
                         String tasktime = OACheckUtil.getJson2Text(object, "startdate");
                         if (!StringUtils.isEmpty(tasktime)) {
-                            tasktime = TimeUtils.long2str(TimeUtils.f_str_2_long(tasktime), "yyyy-MM-dd HH:mm");
+                            tasktime = DateFormatUtil.long2Str(TimeUtils.f_str_2_long(tasktime), "yyyy-MM-dd HH:mm");
                         }
                         intent.putExtra("tasktime", tasktime);//发起时间
                     }
@@ -376,7 +378,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 curDate = calendarView.getDownDate();
                 setDateTag(curDate);
                 if (CommonUtil.isNetWorkConnected(getApplication())) {
-                    loadNetData(TimeUtils.ym_format.format(curDate));
+                    loadNetData(DateFormatUtil.date2Str(curDate,"yyyyMM"));
                 }
 
             }
@@ -391,7 +393,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ScrollView> refreshView) {
                 if (CommonUtil.isNetWorkConnected(getApplicationContext())) {
-                    loadNetData(TimeUtils.ym_format.format(curDate));
+                    loadNetData(DateFormatUtil.date2Str(curDate,"yyyyMM"));
                 } else {
                     ViewUtil.ToastMessage(OAActivity.this, getString(R.string.common_notlinknet), Style.holoRedLight, 2000);
                     if (mPullToRefreshScrollView.isRefreshing()) {
@@ -442,7 +444,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             loadSubordinate();
             getMenuData();
         }
-        loadNetData(String.valueOf(TimeUtils.ym_long_2_str(System.currentTimeMillis())));
+        loadNetData(String.valueOf(DateFormatUtil.long2Str("yyyyMM")));
         posItem = OACalenderViewPagerAdapter.MAX_NUM / 2;
         LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
         linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
@@ -592,10 +594,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         switch (what) {
             case LOAD_NET_DATA:
                 boolean isCurDate = true;
-                String date = TimeUtils.ym_format.format(curDate);
+                String date = DateFormatUtil.date2Str(curDate,"yyyyMM");
                 if (bundle != null) {
                     date = bundle.getString("date");
-                    isCurDate = !StringUtils.isEmpty(date) && date.equals(TimeUtils.ym_format.format(curDate));
+                    isCurDate = !StringUtils.isEmpty(date) && date.equals(DateFormatUtil.date2Str(curDate,"yyyyMM"));
                 }
                 if (isCurDate)
                     handlerListData(object, date);
@@ -651,7 +653,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         OAHttpHelper.getInstance().post(new Runnable() {
             @Override
             public void run() {
-                if (!StringUtils.isEmpty(date) && !date.equals(TimeUtils.ym_format.format(curDate)))
+                if (!StringUtils.isEmpty(date) && !date.equals(DateFormatUtil.date2Str(curDate,"yyyyMM")))
                     return;
                 if (!jsonObject.containsKey("other") && !isMe) {
                     hasOther = false;
@@ -890,7 +892,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
 //        day_tv.setText(day + getString(R.string.common_day));
         yeas_tv.setText(yeas + "年" + month + "月");
         day_tv.setText(day + "日");
-        week_tv.setText(TimeUtils.getWeek(TimeUtils.s_format.format(date)));
+        week_tv.setText(CalendarUtil.getWeek(DateFormatUtil.getFormat(DateFormatUtil.YMD).format(date)));
     }
 
 

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

@@ -13,6 +13,8 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.common.preferences.PreferenceUtils;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
@@ -35,7 +37,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.OAHttpUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.calender.OnCalendarClickListener;
 import com.xzjmyk.pm.activity.ui.erp.view.calender.month.MonthCalendarView;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUAS;
@@ -158,7 +159,7 @@ public class OAMainActivity extends OABaseActivity implements View.OnClickListen
         mcvCalendar.setOnCalendarClickListener(new OnCalendarClickListener() {
             @Override
             public void onClickDate(int year, int month, int day) {
-                long time = TimeUtils.str2long(year + "-" + (month + 1) + "-" + day, "yyyy-MM-dd");
+                long time = DateFormatUtil.str2Long(year + "-" + (month + 1) + "-" + day, "yyyy-MM-dd");
                 setDays(time);
                 //点击日期
                 presenter.selectDate(time);
@@ -166,7 +167,7 @@ public class OAMainActivity extends OABaseActivity implements View.OnClickListen
 
             @Override
             public void onPageChange(int year, int month, int day) {
-                long time = TimeUtils.str2long(year + "-" + (month + 1) + "-" + day, "yyyy-MM-dd");
+                long time = DateFormatUtil.str2Long(year + "-" + (month + 1) + "-" + day, "yyyy-MM-dd");
                 setDays(time);
                 presenter.loadSchedule(time);
             }
@@ -312,7 +313,7 @@ public class OAMainActivity extends OABaseActivity implements View.OnClickListen
     }
 
     private void setDays(long time) {
-        date_tv.setText(TimeUtils.long2str(time, "yyyy年MM月dd日") + "  " + TimeUtils.getWeek(time));
+        date_tv.setText(DateFormatUtil.long2Str(time, "yyyy年MM月dd日") + "  " + CalendarUtil.getWeek(time));
     }
 
 

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

@@ -17,6 +17,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.model.LatLng;
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -29,10 +31,9 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
@@ -120,8 +121,8 @@ public class OutLogListActivity extends BaseActivity {
 
     private void showDateDialog() {
         OASigninPicker picker = new OASigninPicker(this);
-        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
-        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setRange(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
             public void setTime(String year, String month, String day) {
@@ -207,8 +208,8 @@ public class OutLogListActivity extends BaseActivity {
             final JSONObject object = json.getJSONObject(i);
             String str = getStrByJson(object, "mo_signtime");
             if (!StringUtils.isEmpty(str)) {
-                holder.time.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(str), "HH:mm"));
-                holder.day.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(str), "MM/dd"));
+                holder.time.setText(DateFormatUtil.long2Str(TimeUtils.f_str_2_long(str), "HH:mm"));
+                holder.day.setText(DateFormatUtil.long2Str(TimeUtils.f_str_2_long(str), "MM/dd"));
             }
             holder.location.setText(getStrByJson(object, "mo_company"));
             holder.addr.setText(getStrByJson(object, "mo_address"));

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

@@ -25,6 +25,8 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.ui.CameraUtil;
+import com.common.ui.ImageUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.InputMethodUtil;
 import com.common.system.PermissionUtil;
@@ -53,8 +55,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -199,7 +199,7 @@ public class OutSigninOKActivity extends BaseActivity {
         takePicTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
+                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                 CameraUtil.captureImage(OutSigninOKActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
                 closePopupWindow();
             }
@@ -213,7 +213,7 @@ public class OutSigninOKActivity extends BaseActivity {
                     Crouton.makeText(ct, "您当前未被允许使用相册，请使用拍照");
                     return;
                 }
-                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
+                mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this,MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                 CameraUtil.pickImageSimple(OutSigninOKActivity.this, REQUEST_CODE_PICK_PHOTO);
                 closePopupWindow();
             }

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

@@ -12,6 +12,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.AttenddancesBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -22,7 +23,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ public class TeamsAttShowActivity extends BaseActivity {
     private static final int TEAMS_ATTENDANCES_REQUEST = 2017021801;
     private ListView plv;
     private AttenddancesBean mAttenddancesBean;
-    private String myearmonth = TimeUtils.long2str(System.currentTimeMillis(), "yyyyMM");//默认当前月
+    private String myearmonth = DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMM");//默认当前月
     private List<String> teams_section; //员工部门职位 eg：产品规划部>熊短小
     private TeamsAttShowAdapter myadapter;
     private DBManager manager;

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

@@ -22,6 +22,8 @@ import android.widget.TextView;
 import com.afollestad.materialdialogs.MaterialDialog;
 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.system.DisplayUtil;
 import com.common.system.SystemUtil;
 import com.lidroid.xutils.ViewUtils;
@@ -39,8 +41,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.WifiReceiverUtil;
 import com.xzjmyk.pm.activity.ui.me.OfficeAddressSettingsActivity;
 import com.xzjmyk.pm.activity.ui.me.SignSeniorSettingActivity;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
@@ -139,8 +139,8 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
         listview.setLayoutManager(new LinearLayoutManager(ct));
         listview.setAdapter(adapter);
         presenter.start(true);
-        date_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "yyyy年MM月dd日") + " " +
-                TimeUtils.getWeek(System.currentTimeMillis()));
+        date_tv.setText(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy年MM月dd日") + " " +
+                CalendarUtil.getWeek(System.currentTimeMillis()));
         findViewById(R.id.signin_btn).setOnClickListener(this);
         findViewById(R.id.unoffice_).setOnClickListener(this);
         date_tv.setOnClickListener(this);
@@ -345,15 +345,15 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
     //显示时间选择器
     private void showDateDialog() {
         OASigninPicker picker = new OASigninPicker(this);
-        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
-        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setRange(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
-                selectTime = TimeUtils.s_str_2_long(time);
-                isToday = time.equals(TimeUtils.s_long_2_str(System.currentTimeMillis())) ? true : false;
-                date_tv.setText(year + "年" + month + "月" + day + "日 " + TimeUtils.getWeek(selectTime));
+                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);
             }
         });

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

@@ -22,6 +22,7 @@ import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.mapapi.search.core.PoiInfo;
+import com.common.StringUtil;
 import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -546,7 +547,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
     private void invite(String user, final String modeid) {
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
-        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
+        if (!StringUtil.isMobileNumber(phone)) {
             showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
             return;
         }

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

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -42,7 +43,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
@@ -397,7 +397,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         message.setContent(text);
         message.setFromUserName(ownerName);
         message.setFromUserId(ownerId);
-        message.setTimeSend(TimeUtils.sk_time_current_time());
+        message.setTimeSend(CalendarUtil.getSecondMillion());
         if (interprect(ownerId,objectId,message)) {
             return;
         }

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

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -266,7 +267,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         int day = c.get(Calendar.DAY_OF_MONTH);
         yeas_tv.setText(yeas + "年" + month + "月");
         day_tv.setText(day + "日");
-        week_tv.setText(TimeUtils.getWeek(TimeUtils.s_format.format(date)));
+        week_tv.setText(CalendarUtil.getWeek(DateFormatUtil.getFormat(DateFormatUtil.YMD).format(date)));
     }
 
     private void setCalenderOnClicklistener() {

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

@@ -16,6 +16,7 @@ import com.android.volley.AuthFailureError;
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.StringUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.AddAttentionResult;
@@ -504,7 +505,7 @@ public class SelectPContactsPresenter {
         LogUtil.i("invite");
         final String name = CommonUtil.getName();
         final String phone = user.getPosition().trim().replaceAll(" ", "");
-        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
+        if (!StringUtil.isMobileNumber(phone)) {
             iSelectActiveView.showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
             return;
         }

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

@@ -8,11 +8,11 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 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.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.util.SharedUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -17,7 +17,7 @@ import com.xzjmyk.pm.activity.bean.message.XmppMessage;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.util.HtmlUtils;
+import com.xzjmyk.pm.activity.util.im.HtmlUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 

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

@@ -12,7 +12,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
+import com.xzjmyk.pm.activity.util.imageloader.LoadLocalImageUtil;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.common.data.CalendarUtil;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -29,7 +30,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OpenFilesUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.io.File;
@@ -345,7 +345,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private void showTimeSelect(final TextView showView, final int position) {
         DatePicker picker = new DatePicker(ct, DatePicker.YEAR_MONTH_DAY);
         picker.setRange(2015, 2019, true);
-        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override
             public void onDatePicked(String year, String month, String day) {

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

@@ -12,6 +12,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ChangeMobileActivity;
@@ -48,7 +50,7 @@ public class WorkAdapter extends RecyclerView.Adapter<WorkAdapter.ViewHoler> {
         OVERLATETIME = ct.getString(R.string.over_latetime);
         EARLYOFF = ct.getString(R.string.sign_leave);
         isToday = true;
-        newTime = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        newTime = DateFormatUtil.long2Str(System.currentTimeMillis(), "HH:mm");
     }
 
     public List<WorkModel> getModels() {
@@ -60,7 +62,7 @@ public class WorkAdapter extends RecyclerView.Adapter<WorkAdapter.ViewHoler> {
         this.isFreeWork = isFreeWork;
         this.isToday = isToday;
         this.seletTime = seletTime;
-        newTime = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        newTime = DateFormatUtil.long2Str(System.currentTimeMillis(), "HH:mm");
         notifyDataSetChanged();
     }
 
@@ -284,12 +286,12 @@ public class WorkAdapter extends RecyclerView.Adapter<WorkAdapter.ViewHoler> {
         long f_time = TimeUtils.f_str_2_long(TimeUtils.s_long_2_str(System.currentTimeMillis()) +
                 " " + hhmm + ":00");
         f_time += time * 60000;
-        return TimeUtils.long2str(f_time, "HH:mm");
+        return DateFormatUtil.long2Str(f_time, "HH:mm");
     }
 
     private String getTimeForHHmm(String hhmm) {
         if (StringUtils.isEmpty(hhmm)) return "";
-        return TimeUtils.s_long_2_str(seletTime) + " " + TimeUtils.getWeek(seletTime) + " " + hhmm;
+        return TimeUtils.s_long_2_str(seletTime) + " " + CalendarUtil.getWeek(seletTime) + " " + hhmm;
     }
 
     private String getNull(String str) {

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

@@ -12,6 +12,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -99,9 +100,9 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
     }
 
     private void initView() {
-        newHHmm = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
-        date_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "yyyy年MM月"));
-        loadByNet(TimeUtils.long2str(System.currentTimeMillis(), "yyyyMM"));
+        newHHmm = DateFormatUtil.long2Str(System.currentTimeMillis(), "HH:mm");
+        date_tv.setText(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy年MM月"));
+        loadByNet(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMM"));
         View emptyView = LayoutInflater.from(ct).inflate(R.layout.erp_empty_view, null);
         day_lv.setEmptyView(emptyView);
     }
@@ -119,9 +120,9 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
         calender.setOnMonthChangeListener(new CalenderView.OnMonthChangeListener() {
             @Override
             public void selected(String yyyyMM) {
-                long time = TimeUtils.str2long(yyyyMM, "yyyyMM");
+                long time = DateFormatUtil.str2Long(yyyyMM, "yyyyMM");
                 if (time != 0)
-                    date_tv.setText(TimeUtils.long2str(time, "yyyy年MM月"));
+                    date_tv.setText(DateFormatUtil.long2Str(time, "yyyy年MM月"));
                 loadByNet(yyyyMM);
             }
         });
@@ -162,7 +163,7 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
             ((BaseActivity) ct).progressDialog.show();
         }
         Map<String, Object> param = new HashMap<>();
-        param.put("date", TimeUtils.int_long_2_str(time));
+        param.put("date", DateFormatUtil.long2Str(time,"yyyyMMdd"));
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
         bundle.putLong("time", time);

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

@@ -10,6 +10,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.CalendarUtil;
+import com.common.data.DateFormatUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -22,12 +24,12 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
-import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -51,7 +53,7 @@ public class AttendancesFragment extends EasyFragment implements View.OnClickLis
     private TextView hardworking_third_tv;
     private AttenddancesBean mAttenddancesBean;
     private AttenddancesAdapter madapter;
-    private String yearmonth = TimeUtils.long2str(System.currentTimeMillis(), "yyyyMM");
+    private String yearmonth = DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMM");
 
     @Override
     protected int inflateLayoutId() {
@@ -99,10 +101,9 @@ public class AttendancesFragment extends EasyFragment implements View.OnClickLis
         hardworking_second_tv.setOnClickListener(this);
         hardworking_third_tv.setOnClickListener(this);
         madapter = new AttenddancesAdapter();
-
-        String currentDate = TimeUtils.s_long_2_str(System.currentTimeMillis());
-        String start_date_year = TimeUtils.getYear(currentDate) + "";
-        int month = TimeUtils.getMonth(currentDate) + 1;
+        Date date = new Date(System.currentTimeMillis());
+        String start_date_year = CalendarUtil.getYear(date) + "";
+        int month = CalendarUtil.getMonth(date);
         String start_date_month = "";
         if (month < 10) {
             start_date_month = "0" + month;
@@ -160,8 +161,8 @@ public class AttendancesFragment extends EasyFragment implements View.OnClickLis
 
     private void doSelectEndDate() {
         OASigninPicker picker = new OASigninPicker(getActivity());
-        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
-        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setRange(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
             public void setTime(String year, String month, String day) {
@@ -174,8 +175,8 @@ public class AttendancesFragment extends EasyFragment implements View.OnClickLis
 
     private void doSelectStartDate() {
         OASigninPicker picker = new OASigninPicker(getActivity());
-        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
-        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setRange(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
+        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
         picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
             @Override
             public void setTime(String year, String month, String day) {
@@ -183,14 +184,12 @@ public class AttendancesFragment extends EasyFragment implements View.OnClickLis
                 start_date_tv.setText(time);
 
                 //当选择了开始时间后截止时间默认变成所选开始时间那年那月的最后一天
-                String currentDate = TimeUtils.s_long_2_str(System.currentTimeMillis());
-                int currentyear = TimeUtils.getYear(currentDate);
-                int current_month = TimeUtils.getMonth(currentDate) + 1;  //当前月份
-
+                int currentyear = CalendarUtil.getYear();
+                int current_month = CalendarUtil.getMonth();  //当前月份
                 if (current_month == CommonUtil.getNumByString(month) && currentyear == CommonUtil.getNumByString(year)) {
                     end_date_tv.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
                 } else {
-                    int monthdays = TimeUtils.getCurrentDateDays(CommonUtil.getNumByString(year), CommonUtil.getNumByString(month));
+                    int monthdays = CalendarUtil.getCurrentDateDays(CommonUtil.getNumByString(year), CommonUtil.getNumByString(month));
                     end_date_tv.setText(year + "-" + month + "-" + monthdays);
                 }
                 yearmonth = year + month;

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

@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -59,7 +60,7 @@ public class CalendarDateFragmet extends Fragment {
         //判断是否是当月
         calendarView.getCurDate();
         if (activity != null) {
-            activity.setListener(TimeUtils.ym_format.format(date), new SelectCalendarActivity.OnTaskChangeListener() {
+            activity.setListener(DateFormatUtil.date2Str(date,"yyyyMM"), new SelectCalendarActivity.OnTaskChangeListener() {
                 @Override
                 public void onChange(Set<Integer> in) {
                     calendarView.setDecoratDays(in);

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

@@ -23,6 +23,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.map.MapView;
 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.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
@@ -247,9 +249,9 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
 
     private void initview() {
         num_tv.setOnClickListener(this);
-        date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) +
-                " " + TimeUtils.getWeek(System.currentTimeMillis()) +
-                " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+        date_tv.setText(DateFormatUtil.long2Str("yyyy年MM月dd日") +
+                " " + CalendarUtil.getWeek(System.currentTimeMillis()) +
+                " " + DateFormatUtil.long2Str("HH:mm"));
         num_tv.setText("" + sigNum);
         String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);

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

@@ -14,6 +14,7 @@ import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import com.common.preferences.SharedUtil;
 import com.common.system.DisplayUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -28,7 +29,6 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.util.SharedUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import org.json.JSONArray;

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.model.oa;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -183,9 +184,9 @@ public class OAModel {
     public String getTime2Str(String formart) {
         StringBuilder builder = new StringBuilder(" ");
         if (startdate > 0) {
-            builder.append(TimeUtils.long2str(startdate, formart));
+            builder.append(DateFormatUtil.long2Str(startdate, formart));
             if (enddate > startdate)
-                builder.append("--" + TimeUtils.long2str(enddate, formart));
+                builder.append("--" + DateFormatUtil.long2Str(enddate, formart));
         }
         return builder.toString();
     }

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

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormFieldActivity;
@@ -27,7 +28,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.ArrayList;
@@ -887,12 +887,12 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         a.setCaption(nodeDealName);
                         a.setIdKey(status);
                         if (launchTime > 0) {
-                            a.setValues(TimeUtils.long2str(launchTime, "MM-dd HH:mm"));
+                            a.setValues(DateFormatUtil.long2Str(launchTime, "MM-dd HH:mm"));
                         }
                     } else {
                         if (a.isDftypeEQ(nodeDealCode)) {
                             if (launchTime > 0) {
-                                a.setValues(TimeUtils.long2str(launchTime, "MM-dd HH:mm"));
+                                a.setValues(DateFormatUtil.long2Str(launchTime, "MM-dd HH:mm"));
                             }
                             if (!StringUtils.isEmpty(nodeDescription)) {
                                 a.setIdKey(a.getIdKey() + "(" + nodeDescription + ")");

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

@@ -165,7 +165,7 @@ public class MessagePresenter implements OnHttpResultListener {
         //获取网络数据
         Map<String, Object> param = new HashMap<>();
         param.put("count", 100);
-        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + TimeUtils.int_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + DateFormatUtil.long2Str( "yyyyMMdd") + "'");
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
 
         Request request = new Request.Bulider()
@@ -395,7 +395,7 @@ public class MessagePresenter implements OnHttpResultListener {
                 model.setId(object.getInteger("id"));
                 model.setTitle(object.getString("title"));
                 model.setSubTitle(object.getString("subTitle"));
-                model.setTime(TimeUtils.long2str(OACheckUtil.getJsonTime(object, "createTime"), "yyyy-MM-dd HH:mm"));
+                model.setTime(DateFormatUtil.long2Str(OACheckUtil.getJsonTime(object, "createTime"), "yyyy-MM-dd HH:mm"));
                 model.setHierarchy(1);
                 model.setType(type);
                 model.setCount(1);
@@ -539,7 +539,7 @@ public class MessagePresenter implements OnHttpResultListener {
             model = new MessageModel();
             model.setTitle(object.getString("title"));
             model.setSubTitle(object.getString("lastMessage"));
-            model.setTime(TimeUtils.long2str(OACheckUtil.getJsonTime(object, "lastTime"), "yyyy-MM-dd HH:mm"));
+            model.setTime(DateFormatUtil.long2Str(OACheckUtil.getJsonTime(object, "lastTime"), "yyyy-MM-dd HH:mm"));
             model.setType(object.getString("type"));
             if (object.containsKey("count") && object.get("count") != null)
                 model.setCount(object.getInteger("count"));
@@ -589,7 +589,7 @@ public class MessagePresenter implements OnHttpResultListener {
         if (StringUtils.isEmpty(lastTime)) {
             return 0;
         } else {
-            return (int) (TimeUtils.str2long(lastTime, "yyyy-MM-dd HH:mm") / 1000);
+            return (int) (DateFormatUtil.str2Long(lastTime, "yyyy-MM-dd HH:mm") / 1000);
         }
     }
 

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

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IOAView;
@@ -18,7 +19,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.oa.OAHttpUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -105,7 +105,7 @@ public class OAPresenter implements OnHttpResultListener {
         param.put("emcode", CommonUtil.getEmcode());
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().workSchedule :
                 "mobile/crm/gettaskscheduleandvisitplanmsg.action";
-        param.put("date", TimeUtils.long2str(curDate, "yyyyMM"));
+        param.put("date", DateFormatUtil.long2Str(curDate, "yyyyMM"));
         Request request = new Request.Bulider()
                 .setMode(Request.Mode.GET)
                 .setParam(param)

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
@@ -15,7 +16,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.util.HashMap;
@@ -58,7 +58,7 @@ public class SubscriptionPresenter implements OnHttpResultListener {
         }
         Map<String, Object> param = new HashMap<>();
         param.put("count", 100);
-        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + TimeUtils.int_long_2_str(showTime) + "'");
+        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" +  DateFormatUtil.long2Str(showTime,"yyyyMMdd")  + "'");
         Bundle bundle = new Bundle();
         bundle.putBoolean("isRefresh", isRefresh);
         Request request=new Request.Bulider()

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

@@ -11,6 +11,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.baidu.mapapi.search.core.SearchResult;
 import com.baidu.mapapi.search.poi.PoiResult;
+import com.common.data.DateFormatUtil;
 import com.common.preferences.PreferenceUtils;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -105,7 +106,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         if (!isB2b)
             param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
         else
-            param.put("date", TimeUtils.long2str(time, "yyyyMMdd"));
+            param.put("date", DateFormatUtil.long2Str(time, "yyyyMMdd"));
         param.put("caller", "CardLog");
         param.put("emcode", code);
         param.put("master", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
@@ -244,7 +245,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
     /*请求班次数据*/
     private void loadWorkData(long time) {
         Map<String, Object> param = new HashMap<>();
-        param.put("date", TimeUtils.int_long_2_str(time));
+        param.put("date", DateFormatUtil.long2Str(time,"yyyyMMdd") );
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
         bundle.putLong("time", time);

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

@@ -49,6 +49,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
+import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
@@ -835,7 +836,7 @@ public class CommonUtil {
         chatMessage.setFromUserId(Friend.ID_ERP_PROCESS);
         chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
         // 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
-        chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
+        chatMessage.setTimeSend(CalendarUtil.getSecondMillion());
         chatMessage.setContent("您有一条新的待处理流程...");
         chatMessage.setMySend(false);// 表示不是自己发的
         // 往消息表里插入一条记录

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

@@ -5,11 +5,11 @@ import android.content.Context;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.data.CalendarUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -22,7 +22,6 @@ 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.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -202,7 +201,7 @@ public class CreateRoomUtil {
                     friend.setRoomFlag(1);
                     friend.setRoomId(room.getId());
                     // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-                    friend.setTimeSend(TimeUtils.sk_time_current_time());
+                    friend.setTimeSend(CalendarUtil.getSecondMillion());
                     friend.setStatus(Friend.STATUS_FRIEND);
                     FriendDao.getInstance().createOrUpdateFriend(friend);//创建或者更新好友...
                     List<Friend> rooms = FriendDao.getInstance().getAllRooms(loginUserId);
@@ -223,7 +222,7 @@ public class CreateRoomUtil {
         message.setContent("大家注意按时去开会");
         message.setFromUserName(MyApplication.getInstance().mLoginUser.getNickName());
         message.setFromUserId(MyApplication.getInstance().mLoginUser.getUserId());
-        message.setTimeSend(TimeUtils.sk_time_current_time());
+        message.setTimeSend(CalendarUtil.getSecondMillion());
         message.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));
         ChatMessageDao.getInstance().saveNewSingleChatMessage(MyApplication.getInstance().mLoginUser.getUserId(), roomJid, message);
         if (message.getType() == XmppMessage.TYPE_VOICE || message.getType() == XmppMessage.TYPE_IMAGE

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

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.ui.ImageUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
@@ -20,8 +21,7 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 import com.xzjmyk.pm.activity.ui.groupchat.SelectContactsActivity;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
-import com.xzjmyk.pm.activity.util.BitmapUtil;
-import com.xzjmyk.pm.activity.util.ImageUtil;
+import com.xzjmyk.pm.activity.util.imageloader.BitmapUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.route.DrivingRouteLine;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
+import com.common.data.DateFormatUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.SystemUtil;
 import com.xzjmyk.pm.activity.AppConfig;
@@ -262,7 +263,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         param.put("currentMaster", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
         if (isB2b) {
             param.put("pageNumber", 1);
-            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
+            param.put("date", DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMMdd"));
         } else {
             param.put("page", 1);
             param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
@@ -310,7 +311,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
      */
     public void loadWorkData() {
         Map<String, Object> param = new HashMap<>();
-        param.put("date", TimeUtils.int_long_2_str(System.currentTimeMillis()));
+        param.put("date", DateFormatUtil.long2Str("yyyyMMdd"));
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
 
@@ -335,7 +336,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         String code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
         param.put("currentMaster", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
         if (isB2b) {
-            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
+            param.put("date", DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMMdd"));
             param.put("pageNumber", 1);
         } else {
             param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
@@ -653,7 +654,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         } else {
             List<WorkModel> models = WorkModelDao.getInstance().query(false);
             if (ListUtils.isEmpty(models)) return;
-            String time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+            String time = DateFormatUtil.long2Str(System.currentTimeMillis(), "HH:mm");
             for (WorkModel m : models) {
                 //当前时间位于该班次之间
                 if (m.getWorkStart().compareTo(time) < 0 && m.getOffend().compareTo(time) > 0) {
@@ -665,7 +666,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         //取最后一个
         JSONObject object = array.getJSONObject(array.size() - 1);
         String time = object.getString("cl_time");//获取最后一次打卡信息，班次打卡信息
-        time = TimeUtils.clearDay(time);//获取到的
+        time = DateFormatUtil.formatChange(time, DateFormatUtil.HM);//获取到的
         if (StringUtils.isEmpty(time) || model == null) return;
 
         if (StringUtils.isEmpty(model.getWorkSignin()) && model.getWorkStart().compareTo(time) <= 0

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

@@ -7,6 +7,7 @@ import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
@@ -157,7 +158,7 @@ public class CommonInterface implements OnHttpResultListener {
     //获取班次数据
     private void loadWorkData(long time, OnResultListener onResultListener) {
         Map<String, Object> param = new HashMap<>();
-        param.put("date", TimeUtils.int_long_2_str(time));
+        param.put("date", DateFormatUtil.long2Str(time,"yyyyMMdd"));
         Bundle bundle = new Bundle();
         bundle.putLong("time", time);
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
@@ -213,7 +214,7 @@ public class CommonInterface implements OnHttpResultListener {
         if (!isB2b)
             param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
         else
-            param.put("date", TimeUtils.long2str(time, "yyyyMMdd"));
+            param.put("date", DateFormatUtil.long2Str(time, "yyyyMMdd"));
         param.put("caller", "CardLog");
         param.put("emcode", code);
         param.put("master", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -110,7 +111,7 @@ public class OAHttpUtil {
     }
 
     public boolean canShow(OAModel e, Date curDate) {
-        return StringUtils.isInclude(e.getFilterTime(), TimeUtils.s_format.format(curDate));
+        return StringUtils.isInclude(e.getFilterTime(), DateFormatUtil.getFormat(DateFormatUtil.YMD).format(curDate));
     }
 
     public boolean isTaskOk(OAModel e) {

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

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.ui.erp.util.oa;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.model.LatLng;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.db.dao.WorkLocationDao;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
@@ -117,7 +118,7 @@ public class WorkHandlerUtil {
         String timeLog = null;
         if (isB2b) {
             long time = OACheckUtil.getJsonLong(object, "cl_date");
-            timeLog = time == 0 ? "00:00" : TimeUtils.long2str(time, "HH:mm");
+            timeLog = time == 0 ? "00:00" : DateFormatUtil.long2Str(time, "HH:mm");
         } else
             timeLog = getMinTime(object.getString("cl_time"));
         return StringUtils.isEmpty(timeLog) ? "00:00" : timeLog;
@@ -150,7 +151,7 @@ public class WorkHandlerUtil {
                 if (isB2b) {
                     if (listdata.getJSONObject(0).containsKey("cl_date") && listdata.getJSONObject(0).get("cl_date") != null) {
                         long time = listdata.getJSONObject(0).getLong("cl_date");
-                        timeLog = TimeUtils.long2str(time, "HH:mm");
+                        timeLog = DateFormatUtil.long2Str(time, "HH:mm");
                     }
                 } else
                     timeLog = getMinTime(listdata.getJSONObject(0).getString("cl_time"));
@@ -162,7 +163,7 @@ public class WorkHandlerUtil {
                 if (isB2b) {
                     if (listdata.getJSONObject(1).containsKey("cl_date") && listdata.getJSONObject(1).get("cl_date") != null) {
                         long time = listdata.getJSONObject(1).getLong("cl_date");
-                        timeLog = TimeUtils.long2str(time, "HH:mm");
+                        timeLog = DateFormatUtil.long2Str(time, "HH:mm");
                     }
                 } else
                     timeLog = getMinTime(listdata.getJSONObject(1).getString("cl_time"));
@@ -343,7 +344,7 @@ public class WorkHandlerUtil {
         long dayTime = f_str_2_long(TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + workTime + ":00");//获取当前天的workTime
         long deffTime = isWork ? getLongTimeByMinth(OAConfig.nonclass) : -getLongTimeByMinth(OAConfig.nonclass);
         long time = deffTime + dayTime;
-        return TimeUtils.long2str(time, "HH:mm");
+        return DateFormatUtil.long2Str(time, "HH:mm");
     }
 
     private static long getLongTimeByMinth(int minth) {
@@ -454,7 +455,7 @@ public class WorkHandlerUtil {
         if (StringUtils.isEmpty(time)) {
             return "";
         } else {
-            return TimeUtils.long2str(f_str_2_long(time), "HH:mm");
+            return DateFormatUtil.long2Str(f_str_2_long(time), "HH:mm");
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/http/DepositNoticeUtil.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.route.DrivingRouteLine;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity;
@@ -97,7 +98,7 @@ public class DepositNoticeUtil {
     };
 
     public void loadDepostNotice() {
-        String curDate = TimeUtils.s_long_2_str(TimeUtils.str2long(TimeUtil.getCurrentDate(), "yyyy年MM月dd日"));
+        String curDate = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(TimeUtil.getCurrentDate(), "yyyy年MM月dd日"));
         String yyyymmdd = curDate.replaceAll("-", "");
         String url = Constants.IM_BASE_URL + "user/appCurrentList";
         Map<String, Object> params = new HashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calenderlist/CalendarUtils.java

@@ -23,7 +23,7 @@
  ***********************************************************************************/
 package com.xzjmyk.pm.activity.ui.erp.view.calenderlist;
 
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.common.data.DateFormatUtil;
 
 import java.util.Calendar;
 
@@ -87,7 +87,7 @@ public class CalendarUtils {
 
 
     public static int getWeek(String yyyyMMdd) {
-        long time = TimeUtils.str2long(yyyyMMdd, "yyyyMMdd");
+        long time = DateFormatUtil.str2Long(yyyyMMdd, "yyyyMMdd");
         Calendar c = Calendar.getInstance();
         c.setTimeInMillis(time);
         return c.get(Calendar.DAY_OF_WEEK);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/oacalender/CalenderView.java

@@ -8,8 +8,8 @@ import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -53,7 +53,7 @@ public class CalenderView extends ViewPager {
             @Override
             public void onPageSelected(int position) {
                 if (onMonthChangeListener != null) {
-                    String yyyyMM = TimeUtils.long2str(CalenderView.this.date[position].getTime(), MONTH_TAG);
+                    String yyyyMM = DateFormatUtil.long2Str(CalenderView.this.date[position].getTime(), MONTH_TAG);
                     onMonthChangeListener.selected(yyyyMM);
                 }
 

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

@@ -9,10 +9,10 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 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.ViewHolder;
 
 import java.util.List;
 

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

@@ -29,6 +29,9 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
+import com.common.ui.ViewHolder;
+import com.common.data.CalendarUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConfig;
@@ -52,11 +55,9 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.util.ViewHolder;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -233,7 +234,7 @@ public class AutoCreateChatFragment extends EasyFragment {
                     friend.setRoomId(room.getId());
                     friend.setRoomCreateUserId(room.getUserId());
                     // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-                    friend.setTimeSend(TimeUtils.sk_time_current_time());
+                    friend.setTimeSend(CalendarUtil.getSecondMillion());
                     friend.setStatus(Friend.STATUS_FRIEND);
                     FriendDao.getInstance()
                             .createOrUpdateFriend(friend);//创建或者更新好友...

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

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CreateRoomUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
-import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.HorizontalListView;

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

@@ -21,6 +21,9 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.ui.ProgressDialogUtil;
+import com.common.ui.ViewHolder;
+import com.common.data.CalendarUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConfig;
@@ -37,10 +40,8 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.util.ViewHolder;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -217,7 +218,7 @@ public class GroupChatFragment extends EasyFragment {
                     friend.setRoomId(room.getId());
                     friend.setRoomCreateUserId(StringUtils.isEmpty(room.getSubject()) ? room.getUserId() : room.getSubject());
                     // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-                    friend.setTimeSend(TimeUtils.sk_time_current_time());
+                    friend.setTimeSend(CalendarUtil.getSecondMillion());
                     friend.setStatus(Friend.STATUS_FRIEND);
                     FriendDao.getInstance().createOrUpdateFriend(friend);//创建或者更新好友...
 

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

@@ -29,6 +29,9 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.ui.ImageUtil;
+import com.common.ui.ProgressDialogUtil;
+import com.common.data.CalendarUtil;
 import com.common.system.DisplayUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
@@ -53,12 +56,9 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.NumberUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.PropertiesUtil;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
-import com.xzjmyk.pm.activity.util.BitmapUtil;
-import com.xzjmyk.pm.activity.util.Constants;
-import com.xzjmyk.pm.activity.util.ImageUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.imageloader.BitmapUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.HorizontalListView;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -518,7 +518,7 @@ public class SelectContactsActivity extends BaseActivity {
 //        friend.setRoomCreateUserId(mLoginUserId);
         friend.setRoomCreateUserId(photoId);
         // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-        friend.setTimeSend(TimeUtils.sk_time_current_time() - 5);
+        friend.setTimeSend(CalendarUtil.getSecondMillion() - 5);
         friend.setStatus(Friend.STATUS_FRIEND);
         FriendDao.getInstance().createOrUpdateFriend(friend);
         // 更新名片盒（可能需要更新）
@@ -533,7 +533,7 @@ public class SelectContactsActivity extends BaseActivity {
         mucRoomSimple.setName(roomName);
         mucRoomSimple.setDesc(roomDesc);
         mucRoomSimple.setUserId(mLoginUserId);
-        mucRoomSimple.setTimeSend(TimeUtils.sk_time_current_time() - 5);
+        mucRoomSimple.setTimeSend(CalendarUtil.getSecondMillion() - 5);
         String reason = JSON.toJSONString(mucRoomSimple);
         Log.d("roamer", "reason:" + reason);
         // 邀请好友

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

@@ -21,6 +21,10 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.StringUtil;
+import com.common.data.DateFormatUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
@@ -38,9 +42,6 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -71,7 +72,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     private TextView mBirthdayTv;
     private TextView mCityTv;
     private Button mNextStepBtn;
-    private RadioButton rbBoy,rbGrid;
+    private RadioButton rbBoy, rbGrid;
     // Temp
     private User mTempData;
     // 选择头像的数据
@@ -85,7 +86,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
         super.onCreate(savedInstanceState);
         mUser = MyApplication.getInstance().mLoginUser;
         if (!LoginHelper.isUserValidation(mUser)) {
-           // isError = true;
+            // isError = true;
             return;
         }
         mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
@@ -97,9 +98,8 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
         getSupportActionBar().setTitle(R.string.basic_info);
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNameEdit = (EditText) findViewById(R.id.name_edit);
-        rbBoy= (RadioButton) findViewById(R.id.rb_boy);
-        rbGrid= (RadioButton) findViewById(R.id.rb_grid);
-
+        rbBoy = (RadioButton) findViewById(R.id.rb_boy);
+        rbGrid = (RadioButton) findViewById(R.id.rb_grid);
 
 
         mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
@@ -130,19 +130,19 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
 
             rbGrid.setChecked(true);
         }
-        mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
+        mBirthdayTv.setText(DateFormatUtil.long2Str(mTempData.getBirthday() * 1000, DateFormatUtil.YMD));
         //查询数据库
-        DBManager dbManager=new DBManager(this);
-        String userId= mUser.getUserId();
-        String whichsys= CommonUtil.getSharedPreferences(this, "erp_master");
-        List<EmployeesEntity> entities= dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
-        if (ListUtils.isEmpty(entities)){
+        DBManager dbManager = new DBManager(this);
+        String userId = mUser.getUserId();
+        String whichsys = CommonUtil.getSharedPreferences(this, "erp_master");
+        List<EmployeesEntity> entities = dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
+        if (ListUtils.isEmpty(entities)) {
             mNameEdit.setText(mTempData.getNickName());
 
-        }else{
+        } else {
             mNameEdit.setText(entities.get(0).getEM_NAME());
         }
-       // mNameEdit.setText(mTempData.getNickName());
+        // mNameEdit.setText(mTempData.getNickName());
 
         mCityTv.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()));
         AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), mAvatarImg, true);
@@ -197,7 +197,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     private Uri mNewPhotoUri;
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
         CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_CROP_PHOTO);
     }
 
@@ -211,7 +211,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     Uri o = mNewPhotoUri;
-                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
                 } else {
@@ -223,7 +223,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                 if (data != null && data.getData() != null) {
                     String path = CameraUtil.getImagePathFromUri(this, data.getData());
                     Uri o = Uri.fromFile(new File(path));
-                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+                    mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().mLoginUser.getUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     CameraUtil.cropImage(this, o, mNewPhotoUri, REQUEST_CODE_CROP_PHOTO, 1, 1, 300, 300);
                 } else {
@@ -256,7 +256,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                 mTempData.setProvinceId(provinceId);
                 mTempData.setCityId(cityId);
                 mTempData.setAreaId(countyId);
-                
+
                 //选择城市后
                 updateData();
             }
@@ -290,12 +290,12 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
             @Override
             public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
                 GregorianCalendar calendar = new GregorianCalendar(year, monthOfYear, dayOfMonth);
-                
+
                 long currentTime = System.currentTimeMillis() / 1000;
                 long birthdayTime = calendar.getTime().getTime() / 1000;
                 if (birthdayTime > currentTime) {
                     ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
-                }else{
+                } else {
                     mTempData.setBirthday(TimeUtils.getSpecialBeginTime(mBirthdayTv, calendar.getTime().getTime() / 1000));
                     updateData();
                 }
@@ -309,9 +309,9 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     }
 
     private void next() {
-        if (rbBoy.isChecked()){
+        if (rbBoy.isChecked()) {
             mTempData.setSex(1);
-        }else{
+        } else {
             mTempData.setSex(0);
         }
 
@@ -323,7 +323,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
 
         if (TextUtils.isEmpty(mTempData.getNickName())) {
             mNameEdit.requestFocus();
-            mNameEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.name_empty_error));
+            mNameEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.name_empty_error));
             return;
         }
 //        if (!StringUtils.isNickName(mTempData.getNickName())) {
@@ -431,7 +431,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
         } else {
             ProgressDialogUtil.dismiss(mProgressDialog);
             setResult(RESULT_OK);
-                    finish();
+            finish();
         }
 
     }
@@ -448,8 +448,9 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     }
 
     private static final String TAG = "BasicInfoEditActivity";
+
     private void doBack() {
-        Log.i(TAG, "doBack:"+isError);
+        Log.i(TAG, "doBack:" + isError);
         if (isError) {
             super.onBackPressed();
             return;
@@ -511,8 +512,8 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
 
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 if (success) {
-                    Intent intent=new Intent(UPHEAD);
-                    intent.putExtra(UPHEAD,"updata");
+                    Intent intent = new Intent(UPHEAD);
+                    intent.putExtra(UPHEAD, "updata");
                     BasicInfoEditActivity.this.sendBroadcast(intent);
                     AvatarHelper.getInstance().deleteAvatar(loginUserId);
                     ToastUtil.showToast(BasicInfoEditActivity.this, R.string.upload_avatar_success);
@@ -521,7 +522,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                     ToastUtil.showToast(BasicInfoEditActivity.this, R.string.upload_avatar_failed);
                 }
 
-              //  finish();
+                //  finish();
             }
 
             @Override

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

@@ -18,6 +18,7 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.ui.ViewHolder;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.roamer.slidelistview.SlideBaseAdapter;
@@ -31,7 +32,6 @@ import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.tool.VideoPlayActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.util.ViewHolder;
 import com.xzjmyk.pm.activity.video.VideoActivity;
 import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;