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

WeiChat/build.gradle

@@ -17,10 +17,10 @@ android {
             keyPassword '13237658359'
         }
     }
-    
+
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
-   
+
     defaultConfig {
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -74,7 +74,6 @@ dependencies {
     compile deps.cardviewV7
     compile deps.design
     compile deps.multidex
-    compile deps.fastjson
     compile(deps.stetho) {
         force = true
     }
@@ -93,6 +92,7 @@ dependencies {
     debugCompile deps.leakcanary
     releaseCompile deps.leakcanaryNp
     //project
+    compile project(':common')
     compile project(':pullToRefershLibraryMy')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')

WeiChat/src/main/AndroidManifest.xml

@@ -756,7 +756,7 @@
         </receiver>
         <!-- 在百度开发者中心查询应用的API Key -->
 
-        <receiver android:name=".ui.erp.util.oa.DateTimeReceiver">
+        <receiver android:name=".broadcast.DateTimeReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DATE_CHANGED" />
             </intent-filter>
@@ -791,7 +791,7 @@
             android:label="@string/activity_signing" />
 
         <service
-            android:name=".ui.erp.util.oa.AutoErpService"
+            android:name=".util.oa.AutoErpService"
             android:enabled="true"
             android:exported="true" />
 

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/ApplySubscribeActivity.java

@@ -9,15 +9,15 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import com.andreabaccega.widget.FormEditText;
+import com.common.data.DateFormatUtil;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 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.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
-import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.common.data.ListUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

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

@@ -8,9 +8,9 @@ import com.baidu.location.BDLocationListener;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.model.LatLng;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
+import com.common.preferences.PreferenceUtils;
 
 public class BdLocationHelper {
     public static final String UPLOCATION_ACTION = "UPLOCATION_ACTION";//更新位置时候广播数据
@@ -124,11 +124,9 @@ public class BdLocationHelper {
             cityName = location.getCity();
             district = location.getDistrict();
             address = location.getAddrStr();
-//            LogUtil.d("address:"+address);
-//            LogUtil.d("Latitude:"+location.getLatitude()+" Longitude:"+ location.getLongitude());
-            if (!StringUtils.isEmpty(this.location))
+            if (!StringUtil.isEmpty(this.location))
                 PreferenceUtils.putString("bdlocation", this.location);
-            if (!StringUtils.isEmpty(address))
+            if (!StringUtil.isEmpty(address))
                 PreferenceUtils.putString("bdaddress", address);
             errorMessage = "";
         } else {
@@ -168,7 +166,7 @@ public class BdLocationHelper {
 
 
     public String getName() {
-        return StringUtils.isEmpty(location) ? "" : location;
+        return StringUtil.isEmpty(location) ? "" : location;
     }
 
 
@@ -184,7 +182,7 @@ public class BdLocationHelper {
 
     // 获取地址详情
     public String getAddress() {
-        return StringUtils.isEmpty(address) ? PreferenceUtils.getString("bdaddress") : address;
+        return StringUtil.isEmpty(address) ? PreferenceUtils.getString("bdaddress") : address;
     }
 
 

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

@@ -15,12 +15,12 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+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.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.LifecycleCallback;
 
@@ -94,7 +94,7 @@ public class CaptureResultActivity extends Activity {
             if (bundle.getInt(CodeUtils.RESULT_TYPE) == CodeUtils.RESULT_SUCCESS){
                 String result = bundle.getString(CodeUtils.RESULT_STRING);
                 //TODO update fanglh 2017-6-7 新增扫描名片二维码需求
-                if (StringUtils.isEmpty(result)) {
+                if (StringUtil.isEmpty(result)) {
                     Crouton crouton = Crouton.makeText(CaptureResultActivity.this, "您扫描的二维码信息为空", 0xffff4444, 1500);
                     crouton.show();
                     crouton.setLifecycleCallback(new LifecycleCallback() {
@@ -124,7 +124,7 @@ public class CaptureResultActivity extends Activity {
     }
 
     private void doJudgeInfoCard(String result) {
-        Boolean isJSONData = new JsonValidator().validate(result);//是否是JSON格式字符
+        Boolean isJSONData = JSONUtil.validate(result);//是否是JSON格式字符
         if (isJSONData && result.contains("uu_name") && result.contains("uu_phone")){
             startActivity(new Intent(this, ScanInfoResultsActivity.class)
                     .putExtra("ScanResults",result)

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/CustomCrashActivity.java

@@ -8,7 +8,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 

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

@@ -1,7 +1,6 @@
 package com.xzjmyk.pm.activity;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -18,6 +17,9 @@ import android.util.Log;
 import com.android.volley.RequestQueue;
 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;
@@ -43,12 +45,9 @@ import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.ui.SplashActivity;
 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.PreferenceUtils;
-import com.xzjmyk.pm.activity.util.SharedUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.view.AuthImageDownloader;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 import com.xzjmyk.pm.activity.xmpp.MyActivityManager;
@@ -59,7 +58,7 @@ import java.io.File;
 
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
-public class MyApplication extends Application {
+public class MyApplication extends BaseApplication {
     /**
      * @注释：记录Cookie
      */
@@ -78,9 +77,10 @@ public class MyApplication extends Application {
     }
 
 
+
+
     @Override
-    public void onCreate() {
-        super.onCreate();
+    public void initConfig() throws Exception {
         //内存泄漏检测工具初始化
         /*if (AppConfig.DEBUG){
             if (LeakCanary.isInAnalyzerProcess(this)) {
@@ -145,7 +145,7 @@ public class MyApplication extends Application {
         mNetWorkObservable = new NetWorkObservable(this);
         initErpDB();
         try {
-            com.xzjmyk.pm.activity.ui.erp.util.Constants.cleanRed(this);
+            com.xzjmyk.pm.activity.db.Constants.cleanRed(this);
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
@@ -462,12 +462,15 @@ public class MyApplication extends Application {
 
         // 删除webView缓存目录
         if (webviewCacheDir.exists()) {
-            FileUtils.deleteFileOrDir(webviewCacheDir);
+            com.common.file.FileUtils.deleteFileOrDir(webviewCacheDir);
         }
         // 删除webView缓存，缓存目录
         if (appCacheDir.exists()) {
-            FileUtils.deleteFileOrDir(appCacheDir);
+            com.common.file.FileUtils.deleteFileOrDir(appCacheDir);
         }
     }
 
+    public String getLoginUserId() {
+        return (mLoginUser!=null&&!TextUtils.isEmpty(mLoginUser.getUserId()))?mLoginUser.getUserId():"";
+    }
 }

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

@@ -9,7 +9,7 @@ import android.net.ConnectivityManager;
 import android.util.Log;
 
 import com.xzjmyk.pm.activity.NetWorkObservable.NetWorkObserver;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 public class NetWorkObservable extends Observable<NetWorkObserver> {
 	public static interface NetWorkObserver {

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

@@ -14,14 +14,14 @@ 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;
 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.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.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/AllSubscriptionNumbersAdapter.java

@@ -14,8 +14,8 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
 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.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 

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

@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import org.json.JSONArray;

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

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

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

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

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

@@ -11,12 +11,12 @@ import android.widget.ImageView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SelectPicPopupWindow;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
@@ -100,7 +100,7 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer,Sti
 //        }
         Friend friend = mSortFriends.get(position).getBean();
         final String phone = friend.getPhone();
-        if (!StringUtils.isEmpty(phone)) {
+        if (!StringUtil.isEmpty(phone)) {
             String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
             Pattern regex = Pattern.compile(check);
             Matcher matcher = regex.matcher(phone.toString());
@@ -140,13 +140,13 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer,Sti
         String name = friend.getShowName();
         holder.name_tv.setText(name);
         /*个性签名*/
-        holder.sub_tv.setText((StringUtils.isEmpty(friend.getDepart()) ? "" : (friend.getDepart() + ">"))
-                + " " + (StringUtils.isEmpty(friend.getPosition()) ? "" : friend.getPosition()));
+        holder.sub_tv.setText((StringUtil.isEmpty(friend.getDepart()) ? "" : (friend.getDepart() + ">"))
+                + " " + (StringUtil.isEmpty(friend.getPosition()) ? "" : friend.getPosition()));
         final View finalConvertView = convertView;
         holder.phone_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (!StringUtils.isEmpty(phone)) {
+                if (!StringUtil.isEmpty(phone)) {
                     String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
                     Pattern regex = Pattern.compile(check);
                     Matcher matcher = regex.matcher(phone.toString());

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

@@ -14,15 +14,15 @@ 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;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 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.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.util.DisplayUtil;
-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 com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.util.List;
 

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

@@ -8,11 +8,11 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.util.List;
 
@@ -74,7 +74,7 @@ public class NodeAdapter extends BaseAdapter {
             holder.padding.setVisibility(View.GONE);
         }
         int textColor = R.color.hintColor;
-        if (!StringUtils.isEmpty(approval.getIdKey())) {
+        if (!StringUtil.isEmpty(approval.getIdKey())) {
             holder.valuesTv.setText(approval.getIdKey());
             if (approval.getIdKey().startsWith("待审批")) {
                 textColor = R.color.approvaling;
@@ -87,9 +87,9 @@ public class NodeAdapter extends BaseAdapter {
         holder.valuesTv.setTextColor(ct.getResources().getColor(textColor));
         holder.keyTv.setText(approval.getCaption());
         int reId = R.drawable.weishenpi;
-        if (!StringUtils.isEmpty(approval.getIdKey())) {
+        if (!StringUtil.isEmpty(approval.getIdKey())) {
             String status = approval.getIdKey().split("\\(")[0];
-            if (StringUtils.isEmpty(status)) status = "";
+            if (StringUtil.isEmpty(status)) status = "";
             if ("已审批".equals(status)) {
                 reId = R.drawable.node_finished3;
             } else if ("待审批".equals(status)) {

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

@@ -22,6 +22,9 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.StringUtil;
+import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -35,7 +38,7 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
@@ -46,13 +49,10 @@ 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.StringUtils;
-import com.xzjmyk.pm.activity.util.SystemUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.HtmlUtils;
+import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -760,7 +760,7 @@ public class PersonalQzoneAdapter extends BaseAdapter implements BusinessCircleA
             // 设置评论内容
             String commentBody = comment.getBody();
             if (!TextUtils.isEmpty(commentBody)) {
-                commentBody = StringUtils.replaceSpecialChar(comment.getBody());
+                commentBody = StringUtil.replaceSpecialChar(comment.getBody());
                 CharSequence charSequence = HtmlUtils.transform200SpanString(commentBody.replaceAll("\n", "\r\n"),
                         true);
                 builder.append(charSequence);

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

@@ -9,12 +9,12 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.common.data.ListUtils;
 
 import java.util.List;
 
@@ -126,14 +126,14 @@ public class PlatComAfAdapter extends BaseAdapter{
             }
         }else if (datanum != 0 && nodesnum != 0){
             if (position > (datanum - nodesnum - 1)){//已走过审批流的节点
-                if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_result()) &&
+                if (!StringUtil.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_result()) &&
                         mPlatComAfBean.getNodes().get(datanum - position -1).getJn_result().equals("同意")){
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
                     viewHolder.AppFlowStatus.setText(MyApplication.getInstance().getString(R.string.status_approved));
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
                     viewHolder.AppFlowTime.setText(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_dealTime());
 
-                }else if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_result()) &&
+                }else if (!StringUtil.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_result()) &&
                         mPlatComAfBean.getNodes().get(datanum -position -1).getJn_result().equals("不同意")){
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText(MyApplication.getInstance().getString(R.string.common_disagree));
@@ -164,7 +164,7 @@ public class PlatComAfAdapter extends BaseAdapter{
                     viewHolder.AppFlowDescriptiontv.setText("");
                 }
             }else if (position == (datanum - nodesnum -1)){//当前待处理的节点（nodes里面将要统计的数据）
-                if (!StringUtils.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 2).getJn_result()) &&
+                if (!StringUtil.isEmpty(mPlatComAfBean.getNodes().get(datanum - position - 2).getJn_result()) &&
                         mPlatComAfBean.getNodes().get(datanum - position - 2).getJn_result().equals("同意")){
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));

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

@@ -15,12 +15,12 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.PlatDailyBean;
 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.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -176,7 +176,7 @@ public class PlatDailyAdapter extends BaseAdapter {
                     break;
                 default:
                     if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
                             Toast.makeText(mContext, msg.getData().getString("result"), Toast.LENGTH_LONG);
                         }
                     }

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

@@ -22,6 +22,10 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.DateFormatUtil;
+import com.common.data.StringUtil;
+import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -35,7 +39,7 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
@@ -45,13 +49,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.StringUtils;
-import com.xzjmyk.pm.activity.util.SystemUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.HtmlUtils;
+import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -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);
@@ -778,7 +776,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             // 设置评论内容
             String commentBody = comment.getBody();
             if (!TextUtils.isEmpty(commentBody)) {
-                commentBody = StringUtils.replaceSpecialChar(comment.getBody());
+                commentBody = StringUtil.replaceSpecialChar(comment.getBody());
                 CharSequence charSequence = HtmlUtils.transform200SpanString(commentBody.replaceAll("\n", "\r\n"),
                         true);
                 builder.append(charSequence);

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

@@ -11,12 +11,12 @@ import android.widget.ImageView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SelectPicPopupWindow;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
@@ -99,7 +99,7 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
         }
         Friend friend = mSortFriends.get(position).getBean();
         final String phone = friend.getPhone();
-        if (!StringUtils.isEmpty(phone)) {
+        if (!StringUtil.isEmpty(phone)) {
             String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
             Pattern regex = Pattern.compile(check);
             Matcher matcher = regex.matcher(phone.toString());
@@ -139,13 +139,13 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
         String name = friend.getNickName();
         holder.name_tv.setText(name);
         /*个性签名*/
-        holder.sub_tv.setText((StringUtils.isEmpty(friend.getDepart()) ? "" : (friend.getDepart() + ">"))
-                + " " + (StringUtils.isEmpty(friend.getPosition()) ? "" : friend.getPosition()));
+        holder.sub_tv.setText((StringUtil.isEmpty(friend.getDepart()) ? "" : (friend.getDepart() + ">"))
+                + " " + (StringUtil.isEmpty(friend.getPosition()) ? "" : friend.getPosition()));
         final View finalConvertView = convertView;
         holder.phone_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (!StringUtils.isEmpty(phone)) {
+                if (!StringUtil.isEmpty(phone)) {
                     String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
                     Pattern regex = Pattern.compile(check);
                     Matcher matcher = regex.matcher(phone.toString());

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 com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.text.DecimalFormat;
 import java.util.List;

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

@@ -17,12 +17,12 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.WorkDailyBean;
 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.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -171,7 +171,7 @@ public class WorkDailyAdapter extends BaseAdapter {
 
             switch (msg.what){
                 case DELETE_DOC_REQUEST_SUCCESSFULLY:
-                    if (!StringUtils.isEmpty(msg.getData().getString("result"))){
+                    if (!StringUtil.isEmpty(msg.getData().getString("result"))){
                         String delete_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("delete_result", delete_result);
                         if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
@@ -184,7 +184,7 @@ public class WorkDailyAdapter extends BaseAdapter {
 
                 default:
                     if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
                             Toast.makeText(mContext, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
                         }
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/RecordManager.java

@@ -7,7 +7,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 
-import com.xzjmyk.pm.activity.util.FileUtil;
+import com.common.file.CacheFileUtil;
+import com.xzjmyk.pm.activity.MyApplication;
 
 import java.io.File;
 import java.util.Timer;
@@ -127,7 +128,7 @@ public class RecordManager {
 			mr.setOutputFormat(OutputFormat.RAW_AMR);
 			// 输出格式
 			mr.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-			name = FileUtil.getRandomAudioAmrFilePath();
+			name = CacheFileUtil.getRandomAudioAmrFilePath(MyApplication.getInstance(),MyApplication.getInstance().getLoginUserId());
 			
 			if(TextUtils.isEmpty(name)){
 				notifyError();

WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/voicerecognition/VoiceToWord.java

@@ -14,7 +14,7 @@
 //import com.iflytek.cloud.speech.SpeechUser;
 //import com.iflytek.cloud.ui.RecognizerDialog;
 //import com.iflytek.cloud.ui.RecognizerDialogListener;
-//import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+//import com.xzjmyk.pm.activity.ui.erp.util.Lg;
 //
 //public class VoiceToWord extends Activity{
 //	private Context context;
@@ -116,7 +116,7 @@
 //		{
 //			iatDialog.setParameter(SpeechConstant.SAMPLE_RATE, "16000");
 //		}
-//		LogUtil.d("recognizerDialogListener="+recognizerDialogListener);
+//		Lg.d("recognizerDialogListener="+recognizerDialogListener);
 //		if(recognizerDialogListener == null)
 //		{
 //		//	getRecognizerDialogListener();

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/Company.java

@@ -1,8 +1,8 @@
 package com.xzjmyk.pm.activity.bean;
 
+import com.common.data.StringUtil;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.io.Serializable;
 
@@ -261,12 +261,12 @@ public class Company implements Serializable, Cloneable {
 		Company other = (Company) o;
 		boolean equals = true;
 		equals &= id == other.id;
-		equals &= StringUtils.strEquals(name, other.name);
+		equals &= StringUtil.strEquals(name, other.name);
 		equals &= industryId == other.industryId;
 		equals &= natureId == other.natureId;
 		equals &= scale == other.scale;
-		equals &= StringUtils.strEquals(description, other.description);
-		equals &= StringUtils.strEquals(website, other.website);
+		equals &= StringUtil.strEquals(description, other.description);
+		equals &= StringUtil.strEquals(website, other.website);
 		equals &= countryId == other.countryId;
 		equals &= provinceId == other.provinceId;
 		equals &= cityId == other.cityId;
@@ -275,7 +275,7 @@ public class Company implements Serializable, Cloneable {
 		equals &= isAuth == other.isAuth;
 		equals &= longitude == other.longitude;
 		equals &= latitude == other.latitude;
-		equals &= StringUtils.strEquals(address, other.address);
+		equals &= StringUtil.strEquals(address, other.address);
 		equals &= total == other.total;
 		equals &= balance == other.balance;
 		equals &= payMode == other.payMode;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/User.java

@@ -1,9 +1,9 @@
 package com.xzjmyk.pm.activity.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.common.data.StringUtil;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.io.Serializable;
 
@@ -204,12 +204,12 @@ public class User implements Serializable, Cloneable {
 		}
 		User other = (User) o;
 		boolean equals = true;
-		equals &= StringUtils.strEquals(userId, other.userId);
+		equals &= StringUtil.strEquals(userId, other.userId);
 		equals &= userType == other.userType;
-		equals &= StringUtils.strEquals(nickName, other.nickName);
-		equals &= StringUtils.strEquals(telephone, other.telephone);
-		equals &= StringUtils.strEquals(password, other.password);
-		equals &= StringUtils.strEquals(description, other.description);
+		equals &= StringUtil.strEquals(nickName, other.nickName);
+		equals &= StringUtil.strEquals(telephone, other.telephone);
+		equals &= StringUtil.strEquals(password, other.password);
+		equals &= StringUtil.strEquals(description, other.description);
 		equals &= birthday == other.birthday;
 		equals &= sex == other.sex;
 		equals &= countryId == other.countryId;

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/bean/oa/SelectEmUser.java

@@ -3,8 +3,8 @@ package com.xzjmyk.pm.activity.bean.oa;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.common.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 /**
  * 通用选择员工和选择部门通用实体类

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/DateTimeReceiver.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/DateTimeReceiver.java

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

WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/MsgBroadcast.java

@@ -4,9 +4,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.support.v4.content.LocalBroadcastManager;
 
+import com.common.LogUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 /**
  * 用于聊天消息的广播，更新MainActivity Tab栏显示的未读数量 和 消息界面数据的更新

WeiChat/src/main/java/com/xzjmyk/pm/activity/commoninterface/ChangeDataSetInterface.java

@@ -1,33 +0,0 @@
-package com.xzjmyk.pm.activity.commoninterface;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * listview数据源操作接口
- * Created by RaoMeng on 2016/10/28.
- */
-
-public interface ChangeDataSetInterface<T> {
-    void setDatas(List<T> datas);
-
-    List<T> getDatas();
-
-    boolean AddItem(T data);
-  
-    boolean AddItem(int position , T data);
-  
-    /** 
-     * deprecate 
-     * 遍历检索效率低，且实际意义不大。 
-     * */  
-    boolean DeleteItem(T data);
-  
-    boolean DeleteItem(int position);  
-  
-    void Clear(); 
-    
-    void AddAll(LinkedList<T> datas);
-    
-    void ReplaceAll(LinkedList<T> datas);
-} 

WeiChat/src/main/java/com/xzjmyk/pm/activity/commoninterface/SigningInterface.java

@@ -1,14 +0,0 @@
-package com.xzjmyk.pm.activity.commoninterface;
-
-/**
- * 内勤接口
- * Created by Bitliker on 2016/12/6.
- */
-
-public interface SigningInterface {
-
-    //当缓存数据成功后，请求接口后 保存数据到数据库
-    interface OnLoadListener {
-        void loadSuccess();
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/db/Constants.java

@@ -1,13 +1,15 @@
-package com.xzjmyk.pm.activity.ui.erp.util;
+package com.xzjmyk.pm.activity.db;
 
 import android.content.Context;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.common.LogUtil;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.SystemUtil;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 /**
  * Created by Administrator on 2016/1/30.
@@ -342,7 +344,7 @@ public class Constants {
     public static void cleanRed(Context ct) throws PackageManager.NameNotFoundException {
         int versionCode = PreferenceUtils.getInt("versionCode", 0);
         LogUtil.i("versionCode=" + versionCode);
-        int appVersionCode = getVersionCode(ct);
+        int appVersionCode = SystemUtil.getVersionCode(ct);
         if (appVersionCode > versionCode) {
             LogUtil.i("getVersionCode(ct)>versionCode");
             PreferenceUtils.putInt("versionCode", appVersionCode);
@@ -351,11 +353,6 @@ public class Constants {
         }
     }
 
-    private static int getVersionCode(Context ct) throws PackageManager.NameNotFoundException {
-        PackageManager packageManager = ct.getPackageManager();
-        PackageInfo packageInfo = packageManager.getPackageInfo(ct.getPackageName(), 0);
-        LogUtil.i("packageInfo.versionCode=" + packageInfo.versionCode);
-        return packageInfo.versionCode;
-    }
+
 
 }

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/CommonDao.java

@@ -6,8 +6,8 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.AppConfig;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.List;
 
@@ -146,7 +146,7 @@ public class CommonDao<T> {
 
     private void log(String message) {
         try {
-            if (!AppConfig.DEBUG || StringUtils.isEmpty(message)) return;
+            if (!AppConfig.DEBUG || StringUtil.isEmpty(message)) return;
             Log.i("gongpengming", message);
         } catch (Exception e) {
             if (e != null)

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()));
             }
@@ -987,7 +987,7 @@ public class FriendDao {
 //                DBManager manager = new DBManager(MyApplication.getInstance());
 //                String master = CommonUtil.getSharedPreferences(ct, "erp_master");
 //                List<EmployeesEntity> emList = null;
-//                if (!StringUtils.isEmpty(master)) {
+//                if (!StringUtil.isEmpty(master)) {
 //                    emList = manager.select_getEmployee(new String[]{master}, "whichsys=?");
 //                } else {
 //                    emList = new ArrayList<>();
@@ -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/InAndExitTimeDao.java

@@ -6,10 +6,10 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
 import com.xzjmyk.pm.activity.ui.erp.entity.InAndExitTimeEntity;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -87,7 +87,7 @@ public class InAndExitTimeDao {
     }
 
     private void show(String str) {
-        if (StringUtils.isEmpty(str) || !AppConfig.DEBUG) return;
+        if (StringUtil.isEmpty(str) || !AppConfig.DEBUG) return;
         Log.i("Loginin_exit_time", str);
     }
 }

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

@@ -4,14 +4,13 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.common.LogUtil;
+import com.common.data.StringUtil;
+import com.common.preferences.PreferenceUtils;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.MessageModel;
-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.OACheckUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -64,12 +63,12 @@ public class MessageDao {
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             StringBuilder idBuilder = new StringBuilder();
             for (MessageModel e : models)
                 idBuilder.append(e.getId() + ",");
-            OACheckUtil.removieLast(idBuilder);
+            StringUtil.removieLast(idBuilder);
             List<MessageModel> oldList = getEqualId(db, idBuilder.toString(), master, emcode);
             db.beginTransaction();//开始事物
             ContentValues values = null;
@@ -84,7 +83,7 @@ public class MessageDao {
                             String where = "master=? and emcode=? and id=?";
                             String[] whereArgs = {master, emcode, String.valueOf(m.getId())};
                             if (!isFirst) {
-                                if (!StringUtils.isEmpty(m.getReadTime()) && !StringUtils.isEmpty(m.getLastTime())
+                                if (!StringUtil.isEmpty(m.getReadTime()) && !StringUtil.isEmpty(m.getLastTime())
                                         && m.getReadTime().compareTo(m.getLastTime()) < 0)
                                     values.put("isReaded", 0);//不更新状态
                                 else
@@ -146,7 +145,7 @@ public class MessageDao {
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             db.beginTransaction();
             ContentValues values = new ContentValues();
@@ -178,13 +177,13 @@ public class MessageDao {
      * @return
      */
     public boolean unReadForTwoFloor(int id, String type, boolean isReaded) {
-        if (StringUtils.isEmpty(type)) return false;
+        if (StringUtil.isEmpty(type)) return false;
         SQLiteDatabase db = null;
         long i = 0;
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             db.beginTransaction();
             ContentValues values = new ContentValues();
@@ -217,14 +216,14 @@ public class MessageDao {
      * @return
      */
     public boolean upStatusByType(String type, boolean isReaded) {
-        if (StringUtils.isEmpty(type)) return false;
+        if (StringUtil.isEmpty(type)) return false;
         SQLiteDatabase db = null;
         long i = 0;
         try {
             String readTime = TimeUtils.f_long_2_str(System.currentTimeMillis());
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             ContentValues values = new ContentValues();
             values.put("isReaded", isReaded ? 1 : 0);
@@ -261,7 +260,7 @@ public class MessageDao {
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return messageModels;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return messageModels;
             db = DatabaseManager.getInstance().openDatabase();
             String[] columns = {"id", "count", "title", "subTitle", "time", "type", "isReaded", "readTime"};
 //TODO
@@ -293,17 +292,17 @@ public class MessageDao {
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return messageModels;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return messageModels;
             db = DatabaseManager.getInstance().openDatabase();
             String[] columns = {"id", "count", "title", "subTitle", "time", "type", "isReaded", "readTime"};
-            Cursor c =null;
+            Cursor c = null;
             String selection;
             if (platform) {
                 selection = "hierarchy=? and master=? and emcode=?";
-                String[]   selectArgs = {String.valueOf(hierarchy), master, emcode};
+                String[] selectArgs = {String.valueOf(hierarchy), master, emcode};
                 c = db.query(TABLE_NAME, columns, selection, selectArgs, null, null, null);
             } else {
-                  selection = "type=? and hierarchy=? and master=? and emcode=?";
+                selection = "type=? and hierarchy=? and master=? and emcode=?";
                 String[] selectArgs = {type, String.valueOf(hierarchy), master, emcode};
                 c = db.query(TABLE_NAME, columns, selection, selectArgs, null, null, null);
             }
@@ -324,14 +323,14 @@ public class MessageDao {
      * @return
      */
     public boolean deleteBytype(String type) {
-        if (StringUtils.isEmpty(type)) return false;
+        if (StringUtil.isEmpty(type)) return false;
         SQLiteDatabase db = null;
         long i = 0;
         try {
             String readTime = TimeUtils.f_long_2_str(System.currentTimeMillis());
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             String where = "master=? and emcode=? and type=?";
             String[] whereArgs = {master, emcode, type};
@@ -364,7 +363,7 @@ public class MessageDao {
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             db.beginTransaction();
             model.setHierarchy(1);
@@ -453,14 +452,14 @@ public class MessageDao {
      * @return
      */
     public boolean deleteByid(int mag_id) {
-        if (StringUtils.isEmpty(mag_id + "")) return false;
+        if (StringUtil.isEmpty(mag_id + "")) return false;
         String id = mag_id + "";
         SQLiteDatabase db = null;
         long i = 0;
         try {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             String where = "master=? and emcode=? and id=?";
             String[] whereArgs = {master, emcode, id};

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

@@ -7,14 +7,14 @@ import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import com.baidu.mapapi.model.LatLng;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
-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.oa.CommonUtil;
+import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -64,7 +64,7 @@ public class MissionDao {
         try {
             String master = getMaster();
             String emcode = getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             ContentValues values = new ContentValues();
             values.put("status", status);
@@ -91,7 +91,7 @@ public class MissionDao {
             String master = getMaster();
             String emcode = getEmcode();
             String date = TimeUtils.s_long_2_str(System.currentTimeMillis());
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return missions;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return missions;
             db = DatabaseManager.getInstance().openDatabase();
             String[] columns = {"id", "company",
                     "companyAddr", "latitude",
@@ -138,14 +138,14 @@ public class MissionDao {
     }
 
     public boolean updataOrCreate(MissionModel mission) {
-        if (mission == null || StringUtils.isEmpty(mission.getVisitTime())) return false;
+        if (mission == null || StringUtil.isEmpty(mission.getVisitTime())) return false;
         show("updataOrCreate");
         SQLiteDatabase db = null;
         long i = 0;
         try {
             String master = getMaster();
             String emcode = getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             ContentValues values = null;
             show("MissionPlanEntity");
@@ -195,14 +195,14 @@ public class MissionDao {
         try {
             String master = getMaster();
             String emcode = getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             db.beginTransaction();//开启事务
             ContentValues values = null;
             for (MissionModel mission : entities) {
                 show("MissionPlanEntity");
                 //对象为空或是拜访时间没有情况下不插入数据库
-                if (mission == null || StringUtils.isEmpty(mission.getVisitTime())) {
+                if (mission == null || StringUtil.isEmpty(mission.getVisitTime())) {
                     continue;
                 }
                 values = new ContentValues();
@@ -253,7 +253,7 @@ public class MissionDao {
         try {
             String master = getMaster();
             String emcode = getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             ContentValues values = new ContentValues();
             if (mission.getLatLng() != null) {
@@ -282,7 +282,7 @@ public class MissionDao {
 
 
     private String getDateByString(String date) {
-        if (StringUtils.isEmpty(date)) return "";
+        if (StringUtil.isEmpty(date)) return "";
         return TimeUtils.s_long_2_str(TimeUtils.f_str_2_long(date));
     }
 
@@ -293,7 +293,7 @@ public class MissionDao {
         try {
             String master = getMaster();
             String emcode = getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             String where = "master=? and emcode=? and date<=?";
             String[] whereArg = {master, emcode, TimeUtils.s_long_2_str(date)};
@@ -331,7 +331,7 @@ public class MissionDao {
         try {
             String master = getMaster();
             String emcode = getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             String[] columns = {"realvisitTime,realLeaveTime"};
             String selecttion = "master =? and emcode=? and date=? and ( realvisitTime is null or realLeaveTime is null)";
@@ -351,7 +351,7 @@ public class MissionDao {
     }
 
     private void show(String str) {
-        if (StringUtils.isEmpty(str) || !AppConfig.DEBUG) return;
+        if (StringUtil.isEmpty(str) || !AppConfig.DEBUG) return;
         Log.i("gongpengming", str);
     }
 }

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

@@ -6,13 +6,13 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
-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.oa.CommonUtil;
+import com.common.data.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -263,7 +263,7 @@ public class SubsDao {
 
 
     private void show(String str) {
-        if (!AppConfig.DEBUG || StringUtils.isEmpty(str)) return;
+        if (!AppConfig.DEBUG || StringUtil.isEmpty(str)) return;
         Log.i("gongpengming", str);
     }
 }

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

@@ -6,10 +6,10 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.UUStepDataEntity;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -151,6 +151,6 @@ public class UUStepDataDao {
         }
     }
     private void show(String str) {
-        if (StringUtils.isEmpty(str) || !AppConfig.DEBUG) return;
+        if (StringUtil.isEmpty(str) || !AppConfig.DEBUG) return;
     }
 }

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

@@ -6,15 +6,15 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.baidu.mapapi.model.LatLng;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.xzjmyk.pm.activity.util.MessageDialogUtil.show;
 
 /**
  * Created by Bitliker on 2017/2/9.
@@ -48,7 +48,7 @@ public class WorkLocationDao {
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
 
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return beans;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return beans;
             db = DatabaseManager.getInstance().openDatabase();
             String[] columns = {"id", "latitude",
                     "longitude", "shortName",
@@ -75,9 +75,9 @@ public class WorkLocationDao {
             if (cursor != null)
                 cursor.close();
         } catch (android.database.SQLException e) {
-            show("SQLException=" + e.getMessage());
+            LogUtil.i("SQLException=" + e.getMessage());
         } catch (Exception e) {
-            show("Exception=" + e.getMessage());
+            LogUtil.i("Exception=" + e.getMessage());
         } finally {
             if (db != null)
                 DatabaseManager.getInstance().closeDatabase();
@@ -96,7 +96,7 @@ public class WorkLocationDao {
             //添加数据
             String master = CommonUtil.getMaster();
             String emcode = CommonUtil.getEmcode();
-            if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
+            if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             ContentValues values = null;
             for (WorkLocationModel e : entities) {
                 //对象为空或是拜访时间没有情况下不插入数据库
@@ -118,10 +118,10 @@ public class WorkLocationDao {
             db.setTransactionSuccessful();
         } catch (SQLException e) {
             if (e != null)
-                show("clearAll SQLException" + e.getMessage());
+                LogUtil.i("clearAll SQLException" + e.getMessage());
         } catch (Exception e) {
             if (e != null)
-                show("clearAll Exception" + e.getMessage());
+                LogUtil.i("clearAll Exception" + e.getMessage());
         } finally {
             db.endTransaction();
             if (db != null)

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

@@ -4,11 +4,11 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
-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.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.ArrayList;
@@ -80,7 +80,7 @@ public class WorkModelDao {
             String date = TimeUtils.s_long_2_str(time);
             String emCode = CommonUtil.getEmcode();
             String master = CommonUtil.getMaster();
-            if (StringUtils.isEmpty(emCode) || StringUtils.isEmpty(master)) return null;
+            if (StringUtil.isEmpty(emCode) || StringUtil.isEmpty(master)) return null;
             db = DatabaseManager.getInstance().openDatabase();
             String[] columns = getColumns();
             String selection = "emCode=? and master=? and date=?";
@@ -126,7 +126,7 @@ public class WorkModelDao {
         try {
             String emCode = CommonUtil.getEmcode();
             String master = CommonUtil.getMaster();
-            if (StringUtils.isEmpty(emCode) || StringUtils.isEmpty(master)) return 0;
+            if (StringUtil.isEmpty(emCode) || StringUtil.isEmpty(master)) return 0;
             db = DatabaseManager.getInstance().openDatabase();
             String where = "emCode=? and master=?  and date=?";
             String[] whereArg = {emCode, master, TimeUtils.s_long_2_str(date)};
@@ -152,7 +152,7 @@ public class WorkModelDao {
         try {
             String emCode = CommonUtil.getEmcode();
             String master = CommonUtil.getMaster();
-            if (StringUtils.isEmpty(emCode) || StringUtils.isEmpty(master)) return 0;
+            if (StringUtil.isEmpty(emCode) || StringUtil.isEmpty(master)) return 0;
             ContentValues values = getValues(System.currentTimeMillis(), -1, models);
             if (values == null) return -1;
             db = DatabaseManager.getInstance().openDatabase();
@@ -174,7 +174,7 @@ public class WorkModelDao {
     private ContentValues getValues(long time, int id, WorkModel e) {
         String emCode = CommonUtil.getEmcode();
         String master = CommonUtil.getMaster();
-        if (StringUtils.isEmpty(emCode) || StringUtils.isEmpty(master)) return null;
+        if (StringUtil.isEmpty(emCode) || StringUtil.isEmpty(master)) return null;
         if (isEmptyByOne(e.getWorkStart(), e.getWorkTime(), e.getWorkend(), e.getOffStart(), e.getOffTime(), e.getOffend()))
             return null;
         ContentValues values = new ContentValues();
@@ -199,12 +199,12 @@ public class WorkModelDao {
         values.put("offAlarm", e.isLeaveAlarm() ? 1 : 0);
         values.put("isNextDay", e.isNextDay() ? 1 : 0);
 
-        if (!StringUtils.isEmpty(e.getWorkSignin())
+        if (!StringUtil.isEmpty(e.getWorkSignin())
                 && (e.getWorkSignin().compareTo(e.getWorkStart()) < 0 ||
                 e.getWorkSignin().compareTo(e.getWorkend()) > 0))
             values.put("workSignin", "");
         else values.put("workSignin", e.getWorkSignin());
-        if (!StringUtils.isEmpty(e.getOffSignin()) && (e.getOffSignin().compareTo(e.getOffStart()) < 0 ||
+        if (!StringUtil.isEmpty(e.getOffSignin()) && (e.getOffSignin().compareTo(e.getOffStart()) < 0 ||
                 e.getOffSignin().compareTo(e.getOffend()) > 0))
             values.put("offSignin", "");
         else values.put("offSignin", e.getOffSignin());
@@ -229,14 +229,14 @@ public class WorkModelDao {
         boolean isNextDay = c.getInt(c.getColumnIndex("isNextDay")) > 0;//是否是跨天
         boolean offAlarm = c.getInt(c.getColumnIndex("offAlarm")) > 0;//下班提醒
         boolean leaveAlarm = c.getInt(c.getColumnIndex("leaveAlarm")) > 0;//离开提醒
-        if (StringUtils.isEmpty(workStart) || StringUtils.isEmpty(workTime) || StringUtils.isEmpty(workend) ||
-                StringUtils.isEmpty(offStart) || StringUtils.isEmpty(offTime) || StringUtils.isEmpty(offend))
+        if (StringUtil.isEmpty(workStart) || StringUtil.isEmpty(workTime) || StringUtil.isEmpty(workend) ||
+                StringUtil.isEmpty(offStart) || StringUtil.isEmpty(offTime) || StringUtil.isEmpty(offend))
             return null;
 
         if (!showAllSignin) {
-            if (!StringUtils.isEmpty(workSignin) && workSignin.compareTo(workTime) > 0)//迟到  打卡时间>上班时间
+            if (!StringUtil.isEmpty(workSignin) && workSignin.compareTo(workTime) > 0)//迟到  打卡时间>上班时间
                 workSignin = "";
-            if (!StringUtils.isEmpty(offSignin) && offSignin.compareTo(offTime) < 0)//早退  打卡时间<下班时间
+            if (!StringUtil.isEmpty(offSignin) && offSignin.compareTo(offTime) < 0)//早退  打卡时间<下班时间
                 offSignin = "";
         }
         return new WorkModel(id, workStart, workTime,
@@ -261,7 +261,7 @@ public class WorkModelDao {
 
     private boolean isEmptyByOne(String... args) {
         for (String e : args)
-            if (StringUtils.isEmpty(e)) return true;
+            if (StringUtil.isEmpty(e)) return true;
         return false;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/Downloader.java

@@ -1,157 +0,0 @@
-package com.xzjmyk.pm.activity.downloader;
-
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ProgressBar;
-
-import java.io.File;
-
-/**
- * 该程序音频和视频的下载器,仿照ImageLoader的超级简化版
- * 
- * 
- */
-public class Downloader {
-
-	private String mFileDir;
-	private DownloaderEngine mEngine;
-	private Handler mMainHandler;
-
-	private Downloader() {
-		mEngine = new DownloaderEngine();
-		mMainHandler = new Handler(Looper.getMainLooper());
-	}
-
-	private static Downloader instance;
-
-	public static Downloader getInstance() {
-		if (instance == null) {
-			synchronized (Downloader.class) {
-				if (instance == null) {
-					instance = new Downloader();
-				}
-			}
-		}
-		return instance;
-	}
-
-	public synchronized void init(String fileDir) {
-		mFileDir = fileDir;
-	}
-
-	public void addDownload(String uri) {
-		addDownload(uri, new ViewAware(null), null, null);
-	}
-
-	public void addDownload(String uri, DownloadListener listener) {
-		addDownload(uri, new ViewAware(null), listener, null);
-	}
-	
-	public void addDownload(String uri, DownloadProgressListener listener) {
-		addDownload(uri, new ViewAware(null), null, listener);
-	}
-	
-	public void addDownload(String uri, DownloadListener listener,DownloadProgressListener listener2) {
-		addDownload(uri, new ViewAware(null), listener, listener2);
-	}
-
-	public void addDownload(String uri, ProgressBar progressBar, DownloadListener listener) {
-		addDownload(uri, new ViewAware(progressBar), listener, null);
-	}
-
-	public void addDownload(String uri, ProgressBar progressBar, DownloadListener listener, DownloadProgressListener listener2) {
-		addDownload(uri,new ViewAware(progressBar),listener,listener2);
-	}
-	
-	public void addDownload(String uri, ViewAware viewAware, DownloadListener listener, DownloadProgressListener listener2) {
-		if (viewAware == null) {
-			throw new IllegalArgumentException();
-		}
-		if (listener == null) {
-			listener = mEmptyListener;
-		}
-		
-		if (TextUtils.isEmpty(uri)) {
-			mEngine.cancelDisplayTaskFor(viewAware);
-			listener.onFailed(uri, new FailReason(FailReason.FailType.URI_EMPTY, new NullPointerException()),viewAware.getWrappedView());
-			return;
-		}
-		
-		mEngine.prepareDisplayTaskFor(viewAware, uri);
-		
-		listener.onStarted(uri,viewAware.getWrappedView());
-		
-		// 从本地查找
-		File localFile = getFile(uri);
-		if (localFile.exists()) {
-			listener.onComplete(uri, localFile.getPath(),viewAware.getWrappedView());
-			return;
-		}
-
-		// 开始下载
-		DownLoadingInfo downLoadingInfo = new DownLoadingInfo(uri, viewAware,mEngine.getLockForUri(uri), listener, listener2);
-		DownloadTask task = new DownloadTask(mEngine, downLoadingInfo, mMainHandler);
-
-		mEngine.submit(task);
-	}
-
-	private DownloadListener mEmptyListener = new DownloadListener() {
-		
-		@Override
-		public void onFailed(String uri, FailReason failReason,View view) {
-		}
-
-		@Override
-		public void onCancelled(String uri,View view) {
-		}
-
-		@Override
-		public void onStarted(String uri, View view) {
-		}
-
-		@Override
-		public void onComplete(String uri, String filePath, View view) {
-		}
-	};
-
-	public String getDir() {
-		return mFileDir;
-	}
-
-	public File getFile(String uri) {
-		String name = fileNameGenerator(uri);
-		File file = new File(mFileDir, name);
-		return file;
-	}
-	
-	public File getTempFile(String uri) {
-		String name = fileNameGenerator(uri)+".temp";
-		File file = new File(mFileDir, name);
-		return file;
-	}
-
-	public String fileNameGenerator(String url) {
-		if (TextUtils.isEmpty(url)) {
-			return null;
-		}
-		int lastIndex = url.lastIndexOf("/");
-		if (lastIndex == -1) {
-			return url;
-		}
-		return url.substring(lastIndex, url.length());
-	}
-
-	public void pause(View view) {
-		mEngine.pause();
-	}
-
-	public void resume(View view) {
-		mEngine.resume();
-	}
-
-	public void stop(View view) {
-		mEngine.stop();
-	}
-}

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

@@ -40,6 +40,12 @@ import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
+import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
+import com.common.data.StringUtil;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.DisplayUtil;
+import com.common.system.PermissionUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.NetWorkObservable;
@@ -53,7 +59,7 @@ import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
@@ -62,26 +68,18 @@ import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.BadgeUtil;
-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.ui.erp.util.UmengUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService;
+import com.xzjmyk.pm.activity.util.oa.BadgeUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 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.DateFormatUtil;
-import com.xzjmyk.pm.activity.util.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PermissionUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
-import com.xzjmyk.pm.activity.util.QSearchPpwindowUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.dialog.QSearchPpwindowUtils;
+import com.xzjmyk.pm.activity.util.im.Constants;
+import com.xzjmyk.pm.activity.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -180,7 +178,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 Log.i("Log_Send_request", Log_Send_request + "");
                 signAutoLogDao.cleanLocalData(); // 整理本地数据
                 try {
-                    if (!StringUtils.isEmpty(Log_Send_request) &&
+                    if (!StringUtil.isEmpty(Log_Send_request) &&
                             JSON.parseObject(Log_Send_request).containsKey("result") &&
                             JSON.parseObject(Log_Send_request).getBoolean("result")) {
 
@@ -316,7 +314,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 if (mMeFragment == null) {
                     mMeFragment = new MeFragment();
                 }
-                CommonUtil.setSharedPreferences(ct, com.xzjmyk.pm.activity.ui.erp.util.Constants.NEW_ME_TAG, true);
+                CommonUtil.setSharedPreferences(ct, com.xzjmyk.pm.activity.db.Constants.NEW_ME_TAG, true);
                 changeFragment(mMeFragment, TAG_ME);//我
                 getSupportActionBar().setTitle(R.string.me);
             }
@@ -375,7 +373,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         isUnReadWork = isUnRead;
         if (isUnRead) {
             unWorkReadTV.setVisibility(View.VISIBLE);
-        } else if (CommonUtil.getSharedPreferencesBoolean(ct, com.xzjmyk.pm.activity.ui.erp.util.Constants.NEW_ME_TAG, false)) {
+        } else if (CommonUtil.getSharedPreferencesBoolean(ct, com.xzjmyk.pm.activity.db.Constants.NEW_ME_TAG, false)) {
             unWorkReadTV.setVisibility(GONE);
         }
         if (mMeFragment == null) return;
@@ -490,7 +488,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        LogUtil.d("OnCreate start:" + DateFormatUtil.getDateTimeStr());
+        LogUtil.d("OnCreate start:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
         getSupportActionBar().setDisplayShowHomeEnabled(false);
         getSupportActionBar().setDisplayHomeAsUpEnabled(false);
         setContentView(R.layout.activity_main);
@@ -570,18 +568,13 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 //                        CommonUtil.getSharedPreferences(ct, "erp_username")}
 //                , "whichsys=? and em_code=? ");
 //        if (!ListUtils.isEmpty(db)){
-//            if (!StringUtils.isEmpty(db.get(0).getEM_NAME())){
+//            if (!StringUtil.isEmpty(db.get(0).getEM_NAME())){
 //                CommonUtil.setSharedPreferences(ct,"erp_emname",db.get(0).getEM_NAME());
 //            }
 //        }
 //        dbManager.closeDB();
-
-
-        String ids = UmengUtil.getDeviceInfo(ct);
-        LogUtil.i(ids);
-
         doHiTask();
-        LogUtil.d("OnCreate end:" + DateFormatUtil.getDateTimeStr());
+        LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
     }
 
 
@@ -919,7 +912,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             main_tab_three_tv.setVisibility(View.VISIBLE);
         }
 
-        unWorkReadTV.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, com.xzjmyk.pm.activity.ui.erp.util.Constants.NEW_ME_TAG, false) ? View.GONE : View.VISIBLE);
+        unWorkReadTV.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, com.xzjmyk.pm.activity.db.Constants.NEW_ME_TAG, false) ? View.GONE : View.VISIBLE);
         Log.i("new_function_notice", new_function_notice + "");
 
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
@@ -995,7 +988,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         super.onResume();
         initPermission();
         startService(new Intent(this, AutoErpService.class));
-        LogUtil.d("onResume start:" + DateFormatUtil.getDateTimeStr());
+        LogUtil.d("onResume start:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
         if (!AppConfig.COMPANY) return;
         isPause = false;
         if (mMsgNumNeedUpdate) {
@@ -1009,7 +1002,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         } else {
             main_tab_three_tv.setVisibility(View.VISIBLE);
         }
-        LogUtil.d("onResume end:" + DateFormatUtil.getDateTimeStr());
+        LogUtil.d("onResume end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 
         int new_version_rating = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING);
         if (new_version_rating != 1 && MyApplication.getInstance().isNetworkActive()) {
@@ -1022,8 +1015,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         if (ListUtils.isEmpty(models)) return;
 
         String off_time = models.get(models.size() - 1).getOffTime();
-        if (StringUtils.isEmpty(off_time)) return;
-        String cur_time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        if (StringUtil.isEmpty(off_time)) return;
+        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/PushNetMessageReceiver.java

@@ -6,15 +6,15 @@ import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.baidu.android.pushservice.PushMessageReceiver;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.apache.http.Header;
 
@@ -83,19 +83,19 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 	 */
 	@Override
 	public void onNotificationArrived(Context ct, String title, String content, String params) {
-		if(new JsonValidator().validate(params)){
+		if(JSONUtil.validate(params)){
 			  String platform=JSON.parseObject(params).getString("platform");
 			String msgContent = JSON.parseObject(params).getString("content");
 			String master = JSON.parseObject(params).getString("master");
 			String pageTitle = JSON.parseObject(params).getString("pageTitle");
 			Log.i("Arison", "" + pageTitle);
-			if (!com.xzjmyk.pm.activity.util.StringUtils.isEmpty(pageTitle)) {
+			if (!StringUtil.isEmpty(pageTitle)) {
 				if (pageTitle.contains("商务消息")) {
 					CommonUtil.pushProcessB2bMsg(ct, msgContent, master);
 				}
 			}
 
-			if (StringUtils.isEmpty(platform)) {
+			if (StringUtil.isEmpty(platform)) {
 				CommonUtil.pushProcessMsg(ct, MyApplication.getInstance().mLoginUser.getUserId());
 			} else {
 				MsgBroadcast.broadcastMsgUiUpdate(ct);
@@ -114,7 +114,7 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 		Log.i("wang", "title=" + title);
 		Log.i("wang", "content=" + content);
 		Log.i("wang", "params=" + params);
-		if(new JsonValidator().validate(params)){
+		if(JSONUtil.validate(params)){
 			String titlePage=JSON.parseObject(params).getString("title");
 			String url=	JSON.parseObject(params).getString("url");
 			String master=JSON.parseObject(params).getString("master");
@@ -122,7 +122,7 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 			String uu=JSON.parseObject(params).getString("uu");
 			String platform=JSON.parseObject(params).getString("platform");
 
-			if (!StringUtils.isEmpty(platform)){
+			if (!StringUtil.isEmpty(platform)){
 				if ("B2B".equals(platform)){
 					Log.i("wang", "params=" + platform);
 					Log.i("wang", "url=" + url);

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

@@ -12,6 +12,10 @@ import android.widget.RelativeLayout;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.LogUtil;
+import com.common.hmac.Md5Util;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.SystemUtil;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -19,16 +23,12 @@ import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ADActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.Md5Util;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -174,9 +174,9 @@ public class SplashActivity extends BaseActivity {
         params.put("telephone", Md5Util.toMD5(phoneNumber));// 账号登陆的时候需要MD5加密，服务器需求
         params.put("password", password);
         // 附加信息
-        params.put("model", DeviceInfoUtil.getModel());
-        params.put("osVersion", DeviceInfoUtil.getOsVersion());
-        params.put("serial", DeviceInfoUtil.getDeviceId(mContext));
+        params.put("model", SystemUtil.getModel());
+        params.put("osVersion", SystemUtil.getOsVersion());
+        params.put("serial", SystemUtil.getDeviceId(mContext));
         // 地址信息
         double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();

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

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

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

@@ -13,6 +13,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
 import com.umeng.analytics.MobclickAgent;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -21,12 +23,12 @@ import com.xzjmyk.pm.activity.bean.MyPhoto;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
 import com.xzjmyk.pm.activity.bean.message.MucRoom;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -34,11 +36,9 @@ import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
 import com.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.JsonValidator;
-import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -117,7 +117,7 @@ public class DataDownloadActivity extends BaseActivity {
 
     public void writeData(android.os.Message msg) {
         String result = msg.getData().getString("result");
-        if (!new JsonValidator().validate(result)){
+        if (!JSONUtil.validate(result)){
             return;
         }
         JSONObject jsonobject = JSON.parseObject(result);
@@ -145,7 +145,7 @@ public class DataDownloadActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_data_download);
         String name = CommonUtil.getName();
-        if (!StringUtils.isEmpty(name))
+        if (!StringUtil.isEmpty(name))
             MobclickAgent.onProfileSignIn(name);
         UserSp.getInstance(DataDownloadActivity.this).setUpdate(false);// 进入下载资料界面，就将该值赋值false
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
@@ -553,7 +553,7 @@ public class DataDownloadActivity extends BaseActivity {
                 EmployeesEntity eEntity = employeesEntities.get(i);
                 String em_code = eEntity.getEM_CODE();
                 String whichsys = eEntity.getWHICHSYS();
-                if (StringUtils.isEmpty(em_code)) return;
+                if (StringUtil.isEmpty(em_code)) return;
                 if ("UPDATE".equals(eEntity.getFLAG())) {
                     List<EmployeesEntity> tempEntity = DBManager.getInstance().select_getEmployee(new String[]{em_code, whichsys}, "em_code=? and whichsys=?");
                     if (tempEntity.isEmpty()) {

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

@@ -14,22 +14,22 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
+import com.common.hmac.Md5Util;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.PermissionUtil;
+import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.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.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.Md5Util;
-import com.xzjmyk.pm.activity.util.PermissionUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
-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;
@@ -69,7 +69,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if (!StringUtils.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
+        if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
             AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
         }
     }
@@ -120,7 +120,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         findViewById(R.id.login_btn).setOnClickListener(this);
         tv_findPwd.setOnClickListener(this);
         tv_register.setOnClickListener(this);
-        if (!StringUtils.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
+        if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
             AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
         }
     }
@@ -173,9 +173,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 //		params.put("loginNo", phoneNumber);// 账号登陆的时候需要MD5加密，服务器需求
         params.put("password", digestPwd);
         // 附加信息
-        params.put("model", DeviceInfoUtil.getModel());
-        params.put("osVersion", DeviceInfoUtil.getOsVersion());
-        params.put("serial", DeviceInfoUtil.getDeviceId(MyApplication.getInstance()));
+        params.put("model", SystemUtil.getModel());
+        params.put("osVersion", SystemUtil.getOsVersion());
+        params.put("serial", SystemUtil.getDeviceId(MyApplication.getInstance()));
         // 地址信息
         double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();

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

@@ -15,21 +15,21 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.hmac.Md5Util;
+import com.common.ui.ProgressDialogUtil;
+import com.common.system.SystemUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult.Login;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.ActivityStack;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.Md5Util;
-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;
@@ -129,9 +129,9 @@ public class LoginHistoryActivity extends BaseActivity implements View.OnClickLi
 		params.put("telephone", Md5Util.toMD5(mLastLoginUser.getTelephone()));// 账号登陆的时候需要MD5以下，服务器需求
 		params.put("password", digestPwd);
 		// 附加信息
-		params.put("model", DeviceInfoUtil.getModel());
-		params.put("osVersion", DeviceInfoUtil.getOsVersion());
-		params.put("serial", DeviceInfoUtil.getDeviceId(mContext));
+		params.put("model", SystemUtil.getModel());
+		params.put("osVersion", SystemUtil.getOsVersion());
+		params.put("serial", SystemUtil.getDeviceId(mContext));
 		// 地址信息
 		double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
 		double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
@@ -162,7 +162,7 @@ public class LoginHistoryActivity extends BaseActivity implements View.OnClickLi
 						}
 						if (success) {// 登陆成功
 							Login login = result.getData().getLogin();
-							if (login != null && login.getSerial() != null && login.getSerial().equals(DeviceInfoUtil.getDeviceId(mContext))
+							if (login != null && login.getSerial() != null && login.getSerial().equals(SystemUtil.getDeviceId(mContext))
 									&& mOldLoginStatus != LoginHelper.STATUS_USER_NO_UPDATE && mOldLoginStatus != LoginHelper.STATUS_NO_USER) {// 如果Token没变，上次更新也是完整更新，那么直接进入Main程序
 								// 其他的登陆地方都需进入DataDownloadActivity，在DataDownloadActivity里发送此广播
 								LoginHelper.broadcastLogin(mContext);

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

@@ -14,13 +14,13 @@ import android.widget.EditText;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.data.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.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -31,266 +31,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

@@ -9,10 +9,10 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.util.StringUtils;
+import com.common.hmac.Md5Util;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.Md5Util;
+import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 
 /**
  * 注册输入密码界面
@@ -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,6 +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.data.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;
@@ -28,13 +34,9 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-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;
@@ -105,13 +107,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 +165,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 +179,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 +190,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 +273,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())) {
+		if (!StringUtil.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;
 		}
 
@@ -302,10 +304,10 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 		params.put("areaId", String.valueOf(mTempData.getAreaId()));
 
 		// 附加信息
-		params.put("apiVersion", DeviceInfoUtil.getVersionCode(mContext) + "");
-		params.put("model", DeviceInfoUtil.getModel());
-		params.put("osVersion", DeviceInfoUtil.getOsVersion());
-		params.put("serial", DeviceInfoUtil.getDeviceId(mContext));
+		params.put("apiVersion", SystemUtil.getVersionCode(mContext) + "");
+		params.put("model", SystemUtil.getModel());
+		params.put("osVersion", SystemUtil.getOsVersion());
+		params.put("serial", SystemUtil.getDeviceId(mContext));
 		// 地址信息
 		double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
 		double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();

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

@@ -15,13 +15,13 @@ import android.view.WindowManager;
 
 import com.android.volley.Request;
 import com.android.volley.RetryPolicy;
+import com.common.LogUtil;
+import com.common.preferences.PreferenceUtils;
 import com.umeng.analytics.MobclickAgent;
 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.PreferenceUtils;
+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,27 +17,27 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.StringUtil;
+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;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 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;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -274,7 +274,7 @@ public class AttentionFragment extends EasyFragment {
 						if (input.equals(sortFriend.getBean().getShowName())) {// 备注名没变
 							return;
 						}
-						if (!StringUtils.isNickName(input)) {// 不符合昵称
+						if (!StringUtil.isNickName(input)) {// 不符合昵称
 							if (input.length() != 0) {
 								ToastUtil.showToast(getActivity(), R.string.remark_name_format_error);
 								return;

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.data.StringUtil;
+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.util.im.helper.FriendHelper;
+import com.xzjmyk.pm.activity.sortlist.BaseComparator;
+import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 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.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;
@@ -334,7 +334,7 @@ public class FriendFragment extends EasyFragment {
                         if (input.equals(sortFriend.getBean().getShowName())) {// 备注名没变
                             return;
                         }
-                        if (!StringUtils.isNickName(input)) {// 不符合昵称
+                        if (!StringUtil.isNickName(input)) {// 不符合昵称
                             if (input.length() != 0) {
                                 ToastUtil.showToast(getActivity(), R.string.remark_name_format_error);
                                 return;

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,6 +36,12 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.LogUtil;
+import com.common.data.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;
@@ -51,23 +57,17 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
 import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 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.LogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 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.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PermissionUtil;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.SystemUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -167,7 +167,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             phone = getIntent().getStringExtra("phone");
             emcode = getIntent().getStringExtra(AppConstant.EXTRA_EM_CODE);
         }
-        if (StringUtils.isEmpty(mLoginUserId))
+        if (StringUtil.isEmpty(mLoginUserId))
             mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         setContentView(R.layout.activity_basic_info);
         getSupportActionBar().setTitle(R.string.user_info_title);
@@ -206,10 +206,10 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         super.onResume();
         String phonec = phone_tv.getText().toString();
         String do_next = do_next_tv.getText().toString();
-        if (StringUtils.isEmpty(phonec) && !StringUtils.isEmpty(phone)) {
+        if (StringUtil.isEmpty(phonec) && !StringUtil.isEmpty(phone)) {
             phone_tv.setText(phone);
         }
-        if (StringUtils.isEmpty(do_next)) {
+        if (StringUtil.isEmpty(do_next)) {
             do_next_tv.setText(getString(R.string.friend_add));
         }
     }
@@ -292,7 +292,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                 }
 
                 mMoreWindow.showAtLocation(BasicInfoActivity.this.findViewById(R.id.basic_info_ll), Gravity.BOTTOM, 0, 0);
-                DisplayUtil.backgroundAlpha(mContext, 0.5f);
+                DisplayUtil.backgroundAlpha(this, 0.5f);
                 break;
             default:
                 break;
@@ -304,7 +304,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         if (mMoreWindow != null) {
             mMoreWindow.dismiss();
 //            mMoreWindow = null;
-            DisplayUtil.backgroundAlpha(mContext, 1f);
+            DisplayUtil.backgroundAlpha(this, 1f);
 
         }
 
@@ -418,7 +418,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         avatar_img.setOnClickListener(new SingleImageClickListener(head_imageUrl));
         // 判断是否有备注名,有就显示
         if (mFriend != null) {
-            if (StringUtils.isEmpty(userName)) {
+            if (StringUtil.isEmpty(userName)) {
                 if (mFriend.getRemarkName() != null) {
                     name_tv.setText(mFriend.getRemarkName());
                 } else {
@@ -432,7 +432,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         } else {
             Log.i("LoginInfo", "设置当前用户的名字");
             //mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
-            if (StringUtils.isEmpty(userName)) {
+            if (StringUtil.isEmpty(userName)) {
                 name_tv.setText(mUser.getNickName());//陌生人也显示正确名字
             } else {
                 name_tv.setText(userName);
@@ -559,7 +559,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         phone_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (!StringUtils.isEmpty(phone_tv.getText().toString())) {
+                if (!StringUtil.isEmpty(phone_tv.getText().toString())) {
                     String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
                     Pattern regex = Pattern.compile(check);
                     Matcher matcher = regex.matcher(phone_tv.getText().toString());
@@ -600,11 +600,11 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             }
             String depart = friend.getDepart();
             String position = friend.getPosition();
-            email_tv.setText(StringUtils.isEmpty(friend.getPrivacy()) ? "" : friend.getPrivacy());
-            if (!StringUtils.isEmpty(depart) && !StringUtils.isEmpty(position)) {
+            email_tv.setText(StringUtil.isEmpty(friend.getPrivacy()) ? "" : friend.getPrivacy());
+            if (!StringUtil.isEmpty(depart) && !StringUtil.isEmpty(position)) {
                 sub_tv.setText(depart + " > " + position);
             } else {
-                sub_tv.setText(StringUtils.isEmpty(depart) ? "" : depart + (StringUtils.isEmpty(position) ? "" : position));
+                sub_tv.setText(StringUtil.isEmpty(depart) ? "" : depart + (StringUtil.isEmpty(position) ? "" : position));
             }
         }
 
@@ -655,7 +655,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;
         }
@@ -762,7 +762,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                         model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
                         model.setType(1);
-                        if (StringUtils.isEmpty(model.getWhichsys())) {
+                        if (StringUtil.isEmpty(model.getWhichsys())) {
                             model.setWhichsys("");
                         }
                         ContactsDao.getInstance().update(model);
@@ -808,7 +808,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         if (input.equals(friend.getShowName())) {// 备注名没变
                             return;
                         }
-                        if (!StringUtils.isNickName(input)) {// 不符合昵称
+                        if (!StringUtil.isNickName(input)) {// 不符合昵称
                             if (input.length() != 0) {
                                 ToastUtil.showToast(mContext, R.string.remark_name_format_error);
                                 return;
@@ -893,7 +893,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                         model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
                         model.setType(2);
-                        if (StringUtils.isEmpty(model.getWhichsys())) {
+                        if (StringUtil.isEmpty(model.getWhichsys())) {
                             model.setWhichsys("");
                         }
                         ContactsDao.getInstance().update(model);
@@ -1137,7 +1137,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             Intent intent = new Intent(mContext, ChatActivity.class);
             //TODO
             String name = name_tv.getText().toString();
-            if (StringUtils.isEmpty(name))
+            if (StringUtil.isEmpty(name))
                 name = userName;
             mFriend.setRemarkName(name);
             intent.putExtra(ChatActivity.FRIEND, mFriend);

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

@@ -31,6 +31,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.CameraUtil;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.DisplayUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -47,13 +50,10 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FileDataHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.CameraUtil;
-import com.xzjmyk.pm.activity.util.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
@@ -356,7 +356,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
             case R.id.send_qzone:
                 if (mMoreMenuView == null) break; // add time : 2017-5-17 14:16
                 mMoreWindow.showAtLocation(getWindow().getDecorView(), Gravity.BOTTOM, 0, 0);
-                DisplayUtil.backgroundAlpha(mContext, 0.5f);
+                DisplayUtil.backgroundAlpha(this, 0.5f);
                 break;
             case android.R.id.home:
                 startActivity(new Intent(activity, MainActivity.class));
@@ -372,7 +372,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         if (mMoreWindow != null) {
             mMoreWindow.dismiss();
 //            mMoreWindow = null;
-            DisplayUtil.backgroundAlpha(mContext, 1f);
+            DisplayUtil.backgroundAlpha(this, 1f);
 
         }
 
@@ -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/BusinessCircleFragment.java

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

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;
@@ -30,7 +31,7 @@ import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgDetailHeaderView;
@@ -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,10 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.StringUtil;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.DisplayUtil;
+import com.common.ui.CameraUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -39,24 +43,19 @@ import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PersonalQzoneAdapter;
-import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
 import com.xzjmyk.pm.activity.bean.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FileDataHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-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.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
@@ -393,7 +392,7 @@ public class PersonalQzoneActivity extends BaseActivity implements showCEView {
                     , "whichsys=? and em_code=? ");
 
             if (!ListUtils.isEmpty(db)){
-                if (!StringUtils.isEmpty(db.get(0).getEM_NAME())){
+                if (!StringUtil.isEmpty(db.get(0).getEM_NAME())){
                     mQzonename.setTextColor(mContext.getResources().getColor(R.color.white));
                     mQzonename.setText(db.get(0).getEM_NAME());
                 }else{
@@ -633,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,18 +17,18 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.helper.UploadService;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -246,9 +246,9 @@ public class SendAudioActivity extends BaseActivity {
 
 		ProgressDialogUtil.show(mProgressDialog);
 		// 附加信息
-		params.put("model", DeviceInfoUtil.getModel());
-		params.put("osVersion", DeviceInfoUtil.getOsVersion());
-		params.put("serialNumber", DeviceInfoUtil.getDeviceId(mContext));
+		params.put("model", SystemUtil.getModel());
+		params.put("osVersion", SystemUtil.getOsVersion());
+		params.put("serialNumber", SystemUtil.getDeviceId(mContext));
 
 		double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
 		double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();

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

@@ -28,23 +28,23 @@ 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.LogUtil;
+import com.common.data.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;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
-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.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.PermissionUtil;
-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);
@@ -369,9 +369,9 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         }
 
         // 附加信息
-        params.put("model", DeviceInfoUtil.getModel());
-        params.put("osVersion", DeviceInfoUtil.getOsVersion());
-        params.put("serialNumber", DeviceInfoUtil.getDeviceId(getApplicationContext()));
+        params.put("model", SystemUtil.getModel());
+        params.put("osVersion", SystemUtil.getOsVersion());
+        params.put("serialNumber", SystemUtil.getDeviceId(getApplicationContext()));
 
         double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
@@ -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,26 +24,26 @@ 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.LogUtil;
+import com.common.data.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;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
-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.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.PermissionUtil;
-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;
             }
@@ -367,9 +367,9 @@ public class SendVideoActivity extends BaseActivity {
         }
         ProgressDialogUtil.show(mProgressDialog);
         // 附加信息
-        params.put("model", DeviceInfoUtil.getModel());
-        params.put("osVersion", DeviceInfoUtil.getOsVersion());
-        params.put("serialNumber", DeviceInfoUtil.getDeviceId(getApplicationContext()));
+        params.put("model", SystemUtil.getModel());
+        params.put("osVersion", SystemUtil.getOsVersion());
+        params.put("serialNumber", SystemUtil.getDeviceId(getApplicationContext()));
 
         double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
@@ -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("不显示位置")){
@@ -401,7 +401,7 @@ public class SendVideoActivity extends BaseActivity {
         } else {
             params.put("cityId", "0");
         }
-//        LogUtil.d(mConfig.MSG_ADD_URL);
+//        Lg.d(mConfig.MSG_ADD_URL);
         LogUtil.d(JSON.toJSONString(params));
         StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(mConfig.MSG_ADD_URL, new Response.ErrorListener() {
             @Override

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

@@ -35,6 +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.data.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;
@@ -51,17 +55,12 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.FriendHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 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.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PermissionUtil;
-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;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
@@ -288,7 +287,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                 }
 
                 mMoreWindow.showAtLocation(CardInfoActivity.this.findViewById(R.id.basic_info_ll), Gravity.BOTTOM, 0, 0);
-                DisplayUtil.backgroundAlpha(mContext, 0.5f);
+                DisplayUtil.backgroundAlpha(this, 0.5f);
                 break;
             default:
                 break;
@@ -299,7 +298,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         if (mMoreWindow != null) {
             mMoreWindow.dismiss();
 //            mMoreWindow = null;
-            DisplayUtil.backgroundAlpha(mContext, 1f);
+            DisplayUtil.backgroundAlpha(this, 1f);
 
         }
 
@@ -388,7 +387,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), avatar_img, false);
         // 判断是否有备注名,有就显示
         if (mFriend != null) {
-            if (StringUtils.isEmpty(userName)) {
+            if (StringUtil.isEmpty(userName)) {
                 if (mFriend.getRemarkName() != null) {
                     name_tv.setText(mFriend.getRemarkName());
                 } else {
@@ -402,7 +401,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         } else {
             Log.i("LoginInfo", "设置当前用户的名字");
             //mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
-            if (StringUtils.isEmpty(userName)) {
+            if (StringUtil.isEmpty(userName)) {
                 name_tv.setText(mUser.getNickName());//陌生人也显示正确名字
             } else {
                 name_tv.setText(userName);
@@ -476,7 +475,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         phone_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (!com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(phone_tv.getText().toString())) {
+                if (!StringUtil.isEmpty(phone_tv.getText().toString())) {
                     String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
                     Pattern regex = Pattern.compile(check);
                     Matcher matcher = regex.matcher(phone_tv.getText().toString());
@@ -573,7 +572,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;
         }
@@ -716,7 +715,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                         if (input.equals(friend.getShowName())) {// 备注名没变
                             return;
                         }
-                        if (!StringUtils.isNickName(input)) {// 不符合昵称
+                        if (!StringUtil.isNickName(input)) {// 不符合昵称
                             if (input.length() != 0) {
                                 ToastUtil.showToast(mContext, R.string.remark_name_format_error);
                                 return;

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

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

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

@@ -19,6 +19,7 @@ import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.system.DisplayUtil;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -26,9 +27,8 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.ArrayList;

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

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

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

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

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

@@ -24,6 +24,8 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -46,21 +48,19 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.PlatContactAddPeopleActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 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.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.UserRoleUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.CompanyHandlerInfoUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.common.data.ListUtils;
+import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
+import com.xzjmyk.pm.activity.util.oa.AutoErpService;
+import com.xzjmyk.pm.activity.util.oa.CommonInterface;
+import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
+import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 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.ui.tool.ThreadPool;
-import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.common.thread.ThreadPool;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.yalantis.phoenix.PullToRefreshView;
@@ -386,7 +386,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         showDatas = new ArrayList<>();
         for (BaseSortModel<Friend> e : allDatas) {
             String text = e.getBean().getShowName() + e.getBean().getDepart() + e.getBean().getPosition() + e.getBean().getPhone();
-            if (StringUtils.isInclude(text, str)) {
+            if (StringUtil.isInclude(text, str)) {
                 showDatas.add(e);
             }
         }
@@ -416,7 +416,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         DBManager manager = new DBManager();
         String master = CommonUtil.getMaster();
         List<EmployeesEntity> emList = null;
-        if (!StringUtils.isEmpty(master)) {
+        if (!StringUtil.isEmpty(master)) {
             emList = manager.select_getEmployee(new String[]{master}, "whichsys=?");
         }
         manager.closeDB();
@@ -457,7 +457,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         }
         String name = friend.getShowName();
         String wholeSpell = PingYinUtil.getPingYin(name);
-        if (!StringUtils.isEmpty(wholeSpell)) {
+        if (!StringUtil.isEmpty(wholeSpell)) {
             try {
                 String firstLetter = Character.toString(wholeSpell.charAt(0));
                 sidebar.addExist(firstLetter);

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

@@ -19,6 +19,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -37,19 +42,14 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 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.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
-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.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.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
+import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
+import com.xzjmyk.pm.activity.util.oa.http.Request;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
@@ -216,7 +216,7 @@ public class MyFriendActivity extends BaseActivity {
         mAdapter.getmSortFriends().clear();
         for (BaseSortModel<Friend> e : allFriends) {
             String text = e.getBean().getShowName() + e.getBean().getDepart() + e.getBean().getPosition() + e.getBean().getPhone();
-            if (com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isInclude(text, str)) {
+            if (StringUtil.isInclude(text, str)) {
                 mAdapter.getmSortFriends().add(e);
             }
         }
@@ -307,10 +307,10 @@ public class MyFriendActivity extends BaseActivity {
                 List<Friend> friends = new ArrayList<Friend>();
                 for (int i = 0; i < listdata.size(); i++) {
                     o = listdata.getJSONObject(i);
-                    String name = OACheckUtil.getJson2Text(o, "ct_name");
-                    String ct_job = OACheckUtil.getJson2Text(o, "ct_job");
-                    String ct_cucode = OACheckUtil.getJson2Text(o, "ct_cucode");
-                    String ct_cuname = OACheckUtil.getJson2Text(o, "ct_cuname");
+                    String name = JSONUtil.getText(o, "ct_name");
+                    String ct_job = JSONUtil.getText(o, "ct_job");
+                    String ct_cucode = JSONUtil.getText(o, "ct_cucode");
+                    String ct_cuname = JSONUtil.getText(o, "ct_cuname");
                     friend = new Friend();
                     friend.setEmCode(ct_cucode);
                     friend.setRemarkName(ct_cuname);
@@ -383,7 +383,7 @@ public class MyFriendActivity extends BaseActivity {
             manager = new DBManager();
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
         List<EmployeesEntity> emList = null;
-        if (!StringUtils.isEmpty(master)) {
+        if (!StringUtil.isEmpty(master)) {
             emList = manager.select_getEmployee(new String[]{master}, "whichsys=?");
         }
         if (ListUtils.isEmpty(emList)) return;

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

@@ -11,11 +11,11 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.common.data.StringUtil;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.SelectConstantActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectDateActivity;
-import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 /**
@@ -91,8 +91,8 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
                 startActivityForResult(new Intent(mContext, SelectDateActivity.class), 1);
                 break;
             case R.id.search_btn: {
-                if (!StringUtils.isEmpty(mMinAgeEdit.getText().toString()) &&
-                        !StringUtils.isEmpty(mMaxAgeEdit.getText().toString())) {
+                if (!StringUtil.isEmpty(mMinAgeEdit.getText().toString()) &&
+                        !StringUtil.isEmpty(mMaxAgeEdit.getText().toString())) {
                     String minAge = mMinAgeEdit.getText().toString();
                     String maxAge = mMaxAgeEdit.getText().toString();
                     if (minAge.length() > 4 || maxAge.length() > 4)

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

@@ -11,14 +11,14 @@ import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
+import com.common.LogUtil;
+import com.common.preferences.PreferenceUtils;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.util.LogUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 
 
 /**
@@ -97,19 +97,19 @@ public class ADActivity extends BaseActivity {
                 switch (checkedId) {
                     case R.id.rb1:
                         item = 0;
-                        LogUtils.i("R.id.rb1");
+                        LogUtil.i("R.id.rb1");
                         break;
                     case R.id.rb2:
                         item = 1;
-                        LogUtils.i("R.id.rb2");
+                        LogUtil.i("R.id.rb2");
                         break;
                     case R.id.rb3:
                         item = 2;
-                        LogUtils.i("R.id.rb3");
+                        LogUtil.i("R.id.rb3");
                         break;
                     case R.id.rb4:
                         item = 3;
-                        LogUtils.i("R.id.rb4");
+                        LogUtil.i("R.id.rb4");
                         break;
                 }
                 ad_vp.setCurrentItem(item);

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

@@ -30,6 +30,7 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.StringUtil;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -41,10 +42,9 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 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.RecordUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.im.RecordUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.view.TagGroup;
@@ -295,9 +295,9 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                 startActivityForResult(intent, 2);
                 break;
             case R.id.bt_task_add:
-                if (!StringUtils.isEmpty(et_task_startime.getText().toString())
+                if (!StringUtil.isEmpty(et_task_startime.getText().toString())
                         && et_task_people.getTags().length > 0
-                        && !StringUtils.isEmpty(et_task_remark.getText().toString())) {
+                        && !StringUtil.isEmpty(et_task_remark.getText().toString())) {
                     boolean falg = ViewUtil.isCheckDateTime(
                             CommonUtil.getStringDate(System.currentTimeMillis()),
                             et_task_startime.getText().toString(), "yyyy-MM-dd HH:mm:ss");

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

@@ -7,10 +7,10 @@ import android.support.annotation.Nullable;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 /**
  * Created by Bitliker on 2017/7/28.
@@ -44,7 +44,7 @@ public class AppWebViewActivity extends WebViewLoadActivity {
         int nodeId = -1;
         try {
 
-            if (!StringUtils.isEmpty(url)) {
+            if (!StringUtil.isEmpty(url)) {
                 String[] urls = url.split("nodeId=");
                 if (urls != null && urls.length > 1) {
                     String message = urls[1];

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

@@ -19,6 +19,12 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
+import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
+import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.loopj.android.http.AsyncHttpClient;
@@ -31,8 +37,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
@@ -40,16 +46,11 @@ import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSexActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSingleTextActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.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.oa.CommonUtil;
+import com.common.data.ListUtils;
 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.DisplayUtil;
-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();
@@ -182,7 +183,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             mNickname = entities.get(0).getEM_NAME();
         }
         initEmployee(entities);
-        if (!StringUtils.isEmpty(Area.getCityAreaString(0, mTempData.getAreaId()))) {
+        if (!StringUtil.isEmpty(Area.getCityAreaString(0, mTempData.getAreaId()))) {
             tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId())
                     + "-" + Area.getCityAreaString(0, mTempData.getAreaId()));
         } else {
@@ -219,7 +220,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     }
 
     private boolean isNull(String str) {
-        if (StringUtils.isEmpty(str))
+        if (StringUtil.isEmpty(str))
             return true;
         if ("未填写".equals(str.trim()))
             return true;
@@ -227,7 +228,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     }
 
     private String getNotNull(String str) {
-        if (StringUtils.isEmpty(str))
+        if (StringUtil.isEmpty(str))
             return "未填写";
         return str;
 
@@ -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 {
@@ -425,7 +426,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                 String province_name = data.getStringExtra(SelectAreaActivity.EXTRA_PROVINCE_NAME);
                 String city_name = data.getStringExtra(SelectAreaActivity.EXTRA_CITY_NAME);
                 String county_name = data.getStringExtra(SelectAreaActivity.EXTRA_COUNTY_NAME);
-                if (StringUtils.isEmpty(county_name)) {
+                if (StringUtil.isEmpty(county_name)) {
                     tv_address.setText(province_name + "-" + city_name);
                 } else {
                     tv_address.setText(province_name + "-" + city_name + "-" + county_name);
@@ -443,9 +444,9 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             }
         } else if (requestCode == UPDATE_NICKNAME && data != null) {
             mNickname = data.getStringExtra("newnickname");
-            if (!StringUtils.isEmpty(mNickname)) {
-                String name=StringUtils.string2Json(mNickname);
-                if (StringUtils.isEmpty(name)){
+            if (!StringUtil.isEmpty(mNickname)) {
+                String name=StringUtil.toHttpString(mNickname);
+                if (StringUtil.isEmpty(name)){
                     ToastUtil.showToast(ct,R.string.limit_unno_zijie);
                     return;
                 }

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

@@ -21,6 +21,10 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.common.system.ActivityUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -33,7 +37,7 @@ import com.xzjmyk.pm.activity.adapter.CommonDocMainMsgAdapter;
 import com.xzjmyk.pm.activity.adapter.NodeAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
@@ -42,16 +46,12 @@ import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ActivityUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;
-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.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.view.CustomerScrollView;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
@@ -233,7 +233,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             }if ("StandbyApplication".equals(mCaller)) {
                 getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply)+ getString(R.string.doc_detail));
             } else
-            if (!StringUtils.isEmpty(intent.getStringExtra("title"))) {
+            if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
                 getSupportActionBar().setTitle(intent.getStringExtra("title")+ getString(R.string.doc_detail));
             }
             if ("FeePlease!FYBX".equals(mCaller)){
@@ -334,7 +334,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     break;
                 case COM_DOC_RESUB_SUCCESSFUL:  //已提交状态 重新提交操作前的反提交
                     if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("RESUBMITTED_message", result);
 //                            Toast.makeText(ct, "单据反提交成功", Toast.LENGTH_SHORT).show();
@@ -350,7 +350,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     break;
                 case COM_DOC_REDELETE_SUCCESSFUL:  // 已提交状态 删除操作前的反提交
                     if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
                             String refordelete_result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("refordelete", refordelete_result);
                             DeleteComDocRequest(mCaller, mkeyValue);
@@ -361,7 +361,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     if (msg.getData() != null){
                         String new_doc_resub_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("new_doc_resub_result", new_doc_resub_result + "");
-                        if (StringUtils.isEmpty(new_doc_resub_result)) return;
+                        if (StringUtil.isEmpty(new_doc_resub_result)) return;
                         if (JSON.parseObject(new_doc_resub_result).containsKey("success")
                                 && JSON.parseObject(new_doc_resub_result).getBoolean("success")){
                             startActivity(new Intent(CommonDocDetailsActivity.this, DataFormDetailActivity.class)
@@ -380,7 +380,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     if (msg.getData() != null){
                         String new_doc_redelete_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("new_doc_redelete_result", new_doc_redelete_result);
-                        if (StringUtils.isEmpty(new_doc_redelete_result)) return;
+                        if (StringUtil.isEmpty(new_doc_redelete_result)) return;
                         if (JSON.parseObject(new_doc_redelete_result).containsKey("success")
                                 && JSON.parseObject(new_doc_redelete_result).getBoolean("success")) {
                             DeleteComDocRequest(mCaller, mkeyValue);
@@ -392,7 +392,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("0x01result",result);
-                        if (!StringUtils.isEmpty(result) && result.contains("success")&&
+                        if (!StringUtil.isEmpty(result) && result.contains("success")&&
                                 JSON.parseObject(result).getBoolean("success")){
                             startActivity(new Intent(CommonDocDetailsActivity.this, ExpenseReimbursementActivity.class)
                                     .putExtra("caller", mCaller)
@@ -462,9 +462,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
             JSONArray griddataArray = dataObjecty.optJSONArray("griddata");
 
             LogUtil.prinlnLongMsg("amresultJsonObject", amresultJsonObject.toString());
-//            LogUtil.prinlnLongMsg("dataObjecty",dataObjecty.toString());
-//            LogUtil.prinlnLongMsg("formdataArray",formdataArray.toString());
-//            LogUtil.prinlnLongMsg("griddataArray",griddataArray.toString());
             if (formdataArray == null) {
                 mEmptyLayput_applymsg.showEmpty();
                 resanddel_ll.setVisibility(View.GONE);
@@ -671,7 +668,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                     if (bean != null) {
                                         //获取数据库数据获得名字
                                         String imName = String.valueOf(bean.getEM_NAME());
-                                        if (!StringUtils.isEmpty(imName)) {
+                                        if (!StringUtil.isEmpty(imName)) {
                                             af_name = imName;
                                         }
                                         //从数据库数据获得imid
@@ -838,7 +835,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 if (!ListUtils.isEmpty(db)) {
                     section_tv.setText(db.get(0).getEM_DEPART() + ">" + db.get(0).getEM_POSITION());
                     AvatarHelper.getInstance().displayAvatar(String.valueOf(db.get(0).getEm_IMID()), photo_im, true);
-                    if (!StringUtils.isEmpty(db.get(0).getEM_NAME())) {
+                    if (!StringUtil.isEmpty(db.get(0).getEM_NAME())) {
                         name_tv.setText(db.get(0).getEM_NAME());
                     } else {
                         name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
@@ -978,7 +975,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     String imPosition = String.valueOf(bean.getEM_POSITION());
 
                     name_tv.setText(imName);
-                    if (!StringUtils.isEmpty(imId)) {
+                    if (!StringUtil.isEmpty(imId)) {
                         AvatarHelper.getInstance().display(imId, photo_im, true, false);
                     } else {
                         String imageUri = "drawable://" + R.drawable.common_header_boy;

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

@@ -8,7 +8,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.ui.groupchat.AutoCreateChatFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 

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

@@ -31,6 +31,10 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.data.CalendarUtil;
+import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
@@ -38,7 +42,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
@@ -47,16 +51,12 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
 import com.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.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
-import com.xzjmyk.pm.activity.util.DisplayUtil;
-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;
@@ -243,7 +243,7 @@ public class CompanyContactsActivity extends BaseActivity  {
                             "or_subof=? and whichsys=?", or_id_sqlite, master);
                     //hrorgs_left = LoadGroupData(hrorgs_left);//常用组
                     adapter = new DetailItemAdapter(ct, hrorgs_left);
-                    if (!StringUtils.isEmpty(next_or_id)) {
+                    if (!StringUtil.isEmpty(next_or_id)) {
                         adapter.setSelectOrId(Integer.valueOf(next_or_id));
                         adapter.setMode(LIST_TOP_MODE);
                     } else {
@@ -254,7 +254,7 @@ public class CompanyContactsActivity extends BaseActivity  {
 //				ViewUtil.setListViewHeightBasedOnChildren(listview);
                     // 得到左边栏数据之后，左边栏第一项，默认加载右边栏数据；
                     if (hrorgs_left.getHrorgs().size() > 0) {
-                        if (!StringUtils.isEmpty(next_or_id)) {
+                        if (!StringUtil.isEmpty(next_or_id)) {
                             keystore.put(next_or_name, next_or_id);
                             tabTitle = parseHashMap(keystore, next_or_name);
                             LoadLeafHrorgFromServer(next_or_id, LOAD_SUCCESS_LEAFHRORG_RIGHT);
@@ -588,7 +588,7 @@ public class CompanyContactsActivity extends BaseActivity  {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (!StringUtils.isEmpty(s.toString())) {
+                if (!StringUtil.isEmpty(s.toString())) {
                     searchData = searchEmployee(s.toString());
                     if (!ListUtils.isEmpty(searchData)) {
                         popupWindow = null;
@@ -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);
@@ -735,7 +735,7 @@ public class CompanyContactsActivity extends BaseActivity  {
      * @功能:加载通讯录数据
      */
     public void LoadServerData(String master, String lastdate) {
-        if (StringUtils.isEmpty(master)) {
+        if (StringUtil.isEmpty(master)) {
             reScrollView.setRefreshing(false);
             ll_content.setVisibility(View.GONE);
             rl_empty.setVisibility(View.VISIBLE);
@@ -840,7 +840,7 @@ public class CompanyContactsActivity extends BaseActivity  {
                 EmployeesEntity eEntity = employeesEntities.get(i);
                 String em_code = eEntity.getEM_CODE();
                 String whichsys = eEntity.getWHICHSYS();
-                if (StringUtils.isEmpty(em_code)) return;
+                if (StringUtil.isEmpty(em_code)) return;
                 if ("UPDATE".equals(eEntity.getFLAG())) {
                     List<EmployeesEntity> tempEntity = manager.select_getEmployee(new String[]{em_code, whichsys}, "em_code=? and whichsys=?");
                     if (tempEntity.isEmpty()) {

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

@@ -22,20 +22,20 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.StringUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-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.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
 import java.util.ArrayList;
@@ -312,7 +312,7 @@ public class DbfindList2Activity extends BaseActivity{
             holder.select_scb.setChecked(users.get(i).isClick());
             holder.select_scb.setFocusable(false);
             holder.select_scb.setClickable(false);
-            String str = (StringUtils.isEmpty(users.get(i).getEm_position()) ? "" : (" | " + users.get(i).getEm_position()));
+            String str = (StringUtil.isEmpty(users.get(i).getEm_position()) ? "" : (" | " + users.get(i).getEm_position()));
             holder.id_tv.setText(users.get(i).getEm_defaultorname() + str);
             holder.name_tv.setText(users.get(i).getEm_name());
             holder.encode=users.get(i).getEm_code();

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

@@ -27,6 +27,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.StringUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
@@ -35,10 +36,9 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-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.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -77,7 +77,7 @@ public class DbfindListActivity extends BaseActivity {
             switch (msg.what) {
                 case SUCCESS_LOADDATA:
                     progressDialog.dismiss();
-                    if (StringUtils.isEmpty(msg.getData().getString("result"))){
+                    if (StringUtil.isEmpty(msg.getData().getString("result"))){
                         ToastMessage(getResources().getString(R.string.networks_out));
                         return;
                     }
@@ -160,7 +160,7 @@ public class DbfindListActivity extends BaseActivity {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s.length() != 0 && !StringUtils.isEmpty(s.toString())) {
+                if (s.length() != 0 && !StringUtil.isEmpty(s.toString())) {
                     loadEmployees(s.toString());
                 }
             }

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

@@ -22,6 +22,8 @@ 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.data.StringUtil;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -33,9 +35,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 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.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
@@ -111,7 +112,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     Intent intent = new Intent();
                     String task = tv_task_emcode.getText().toString();
                     int type = 0;
-                    if (!StringUtils.isEmpty(task) && task.equals(CommonUtil.getName())) {
+                    if (!StringUtil.isEmpty(task) && task.equals(CommonUtil.getName())) {
                         type = 1;
                     }
                     intent.putExtra("type", type);
@@ -123,7 +124,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
 //				progressDialog.dismiss();
                     object = JSON.parseObject(result);
                     String em_name = object.getString("em_name");
-                    if (!StringUtils.isEmpty(em_name)) {
+                    if (!StringUtil.isEmpty(em_name)) {
                         CommonUtil.setSharedPreferences(ct, "erp_emname", em_name);
                     }
                     break;
@@ -209,15 +210,15 @@ 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");
         String attachs = intent.getStringExtra("attachs");
-        if (!StringUtils.isEmpty(attachs)) {
+        if (!StringUtil.isEmpty(attachs)) {
             // 加载语音文件
             String url = Constants.getAppBaseUrl(ct) + "/common/downloadbyId.action?id=" + attachs.split(";")[0];
             downFileToSD("/uu/recorder_download/" + attachs.split(";")[0] + ".amr", url);
@@ -263,7 +264,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         if (str == null) return false;
         String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
         //在未知情况下出现获取不到的情况
-        emname = (StringUtils.isEmpty(emname) ? MyApplication.getInstance().mLoginUser.getNickName() : emname);
+        emname = (StringUtil.isEmpty(emname) ? MyApplication.getInstance().mLoginUser.getNickName() : emname);
         Pattern p = Pattern.compile(str);
         Matcher m = p.matcher(emname);
         return m.find();
@@ -279,7 +280,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         switch (v.getId()) {
             case R.id.bt_task_huifu:
                 Map<String, String> param = new HashMap<String, String>();
-                if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
+                if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
                     param.put("ra_id", taskId);
                     param.put("record", et_task_name.getText().toString());
                     sendDataToServer("plm/record/endBillTask.action", param);
@@ -288,7 +289,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                 }
                 break;
             case R.id.bt_task_bohui:
-                if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
+                if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
                     param = new HashMap<String, String>();
                     param.put("ra_id", taskId);
                     param.put("record", et_task_name.getText().toString());
@@ -299,7 +300,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
 
                 break;
             case R.id.bt_task_queren:
-                if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
+                if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
                     param = new HashMap<String, String>();
                     param.put("ra_id", taskId);
                     param.put("record", et_task_name.getText().toString());

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

@@ -15,16 +15,16 @@ import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 
 import com.andreabaccega.widget.FormEditText;
+import com.common.data.StringUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraLeaveEntity;
 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.FlexJsonUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
@@ -312,7 +312,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 				leaveEntitie.getSa_enddate().length()-3));
 
 		String status = leaveEntities.get(0).getSa_status();
-		if (!StringUtils.isEmpty(status)) {
+		if (!StringUtil.isEmpty(status)) {
 			if ("已提交".equals(status)) {
 				bt_extra_commit.setTextColor(getResources().getColor(
 						R.color.gray));
@@ -392,7 +392,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 		String formCondition = intent.getStringExtra("formCondition");
 		String gridCondition = intent.getStringExtra("gridCondition");
 		String caller = intent.getStringExtra("caller");
-		if (!StringUtils.isEmpty(caller)) {
+		if (!StringUtil.isEmpty(caller)) {
 			String url = Constants.getAppBaseUrl(this)
 					+ "mobile/common/getPanel.action";
 			String sessionId = CommonUtil.getSharedPreferences(this,
@@ -603,7 +603,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 		Map<String,Object> params = new HashMap<String,Object>();
 		params.put("id", String.valueOf(va_id));
 		params.put("caller", "SpeAttendance");
-		if (StringUtils.isEmpty(jsondata)) {
+		if (StringUtil.isEmpty(jsondata)) {
 			ExtraLeaveEntity entity = getSaveJsonData();
 			jsondata = FlexJsonUtil.toJson(entity);
 		}

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

@@ -26,10 +26,10 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.xzjmyk.pm.activity.ui.erp.util.Blowfish;
-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.FlexJsonUtil;
+import com.xzjmyk.pm.activity.util.im.Blowfish;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.apache.http.client.ClientProtocolException;

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

@@ -22,6 +22,8 @@ import android.widget.RelativeLayout;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
@@ -35,17 +37,15 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveEntity;
 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.FlexJsonUtil;
-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.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
+import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -383,7 +383,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
             System.out.println("et_recoder:" + et_recoder);
             System.out.println("et_emcode:" + et_emcode);
             System.out.println("初始化数据：" + JSON.toJSONString(leaveEntitie));
-            if (!StringUtils.isEmpty(status)) {
+            if (!StringUtil.isEmpty(status)) {
                 if ("已提交".equals(status)) {
                     bt_commit.setTextColor(getResources()
                             .getColor(R.color.gray));
@@ -633,7 +633,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
         String gridCondition = intent.getStringExtra("gridCondition");
         String caller = intent.getStringExtra("caller");
 
-        if (!StringUtils.isEmpty(caller)) {
+        if (!StringUtil.isEmpty(caller)) {
             //需要初始化编辑界面
             String url = Constants.getAppBaseUrl(this) +
                     "mobile/common/getPanel.action";

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

@@ -10,9 +10,9 @@ import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 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.util.oa.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/NewsDetailActivity.java

@@ -12,14 +12,14 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.StringUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 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.StringUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -102,10 +102,10 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 			switch (msg.what) {
 			case Constants.LOAD_SUCCESS:
 				String result=msg.getData().getString("result");
-				if(StringUtils.isEmpty(result))return;
+				if(StringUtil.isEmpty(result))return;
 				if(JSON.parseObject(result).getJSONObject("news")==null)return;
 			    String html=JSON.parseObject(result).getJSONObject("news").getString("ne_content");
-				if (!StringUtils.isEmpty(html)) {
+				if (!StringUtil.isEmpty(html)) {
 					tv_content.setText(Html.fromHtml(html));
 				}
 			    JSONObject preObject=	JSON.parseObject(result).getJSONObject("news").getJSONObject("prevNews");
@@ -129,7 +129,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 				break;
 			case LOAD_SUCESS_NOTICE:
 				result=msg.getData().getString("result");
-				if(StringUtils.isEmpty(result))return;
+				if(StringUtil.isEmpty(result))return;
 			    String content=	JSON.parseObject(result).getString("content");
 				tv_content.setText(Html.fromHtml(content));
 				if (type==1) {

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

@@ -31,9 +31,9 @@ import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
 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.ObjectUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 

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

@@ -27,9 +27,9 @@ import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
 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.ObjectUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.json.JSONArray;

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

@@ -19,6 +19,8 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
@@ -35,14 +37,12 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveUpdateEntity;
 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.FlexJsonUtil;
-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.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -104,7 +104,7 @@ public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDial
 
         Intent intent = getIntent();
         resubmit = intent.getStringExtra("submittype");
-        if (!StringUtils.isEmpty(resubmit)){
+        if (!StringUtil.isEmpty(resubmit)){
             doShowResubmitData(intent);
         }
 
@@ -220,7 +220,7 @@ public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDial
 
                 case DOC_UPDATE_SAVE:
                     if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
                             String doc_update_save_result = msg.getData().getString("result");
                             Log.d("doc_update_save_result",doc_update_save_result);
                             Toast.makeText(getApplicationContext(),getString(R.string.update_success),Toast.LENGTH_LONG).show();
@@ -236,7 +236,7 @@ public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDial
                     break;
                 default:
                     if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
                             ToastMessage(msg.getData().getString("result"));
                         }
                     }

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

@@ -44,10 +44,10 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewAdapter;
 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.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.xzjmyk.pm.activity.db.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.MonPickerDialog;

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

@@ -18,22 +18,22 @@ import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.JSONUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.db.Constants;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Approve;
 import com.xzjmyk.pm.activity.ui.erp.model.DetailColumns;
 import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.PanelItems;
 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.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.PickDialog;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.Approve;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -93,7 +93,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 		public void handleMessage(android.os.Message msg) {
 			switch (msg.what) {
 				case Constants.APP_SOCKETIMEOUTEXCEPTION:
-					if(new JsonValidator().validate(msg.getData().getString("result"))){
+					if(JSONUtil.validate(msg.getData().getString("result"))){
 						String messge=JSON.parseObject(msg.getData().getString("exception")).getString("exception");
 						ViewUtil.ToastMessage(ct, messge);
 					}