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

WeiChat/build.gradle

@@ -77,7 +77,7 @@ dependencies {
     compile deps.appcompatV7
     compile deps.cardviewV7
     compile deps.design
-    compile deps.multidex
+   
     compile(deps.stetho) {
         force = true
     }

WeiChat/src/main/AndroidManifest.xml

@@ -116,7 +116,7 @@
     <!-- 自动聚焦权限 -->
     <!-- 全局样式不要随意改动  @style/AppTheme -->
     <application
-        android:name=".MyApplication"
+        android:name="com.core.app.MyApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="false"
         android:icon="@drawable/uuu"

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

@@ -15,7 +15,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -172,7 +172,7 @@ public class ApplySubscribeActivity extends BaseActivity {
      * 提交保存
      */
     private void sendSubmitRequest() {
-        String submitUrl = Constants.getAppBaseUrl(ct) + "/common/submitCommon.action";
+        String submitUrl = CommonUtil.getAppBaseUrl(ct) + "/common/submitCommon.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", "SubsApply");
         params.put("id", mAsId);
@@ -225,7 +225,7 @@ public class ApplySubscribeActivity extends BaseActivity {
             return;
         }
 
-        String url = Constants.getAppBaseUrl(ct) + "/common/saveCommon.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "/common/saveCommon.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
         params.put("caller", "SubsApply");

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

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.os.Build;
@@ -20,10 +19,16 @@ import com.baidu.mapapi.SDKInitializer;
 import com.common.config.BaseApplication;
 import com.common.preferences.PreferenceUtils;
 import com.common.preferences.SharedUtil;
+import com.core.app.AppConfig;
+import com.core.model.ConfigBean;
+import com.core.model.User;
+import com.core.net.NetWorkObservable;
+import com.core.net.location.BdLocationHelper;
+import com.core.net.ssl.AuthImageDownloader;
+import com.core.net.volley.FastVolley;
 import com.facebook.stetho.Stetho;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechUtility;
-import com.lidroid.xutils.DbUtils;
 import com.lidroid.xutils.HttpUtils;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
 import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
@@ -38,19 +43,14 @@ import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.socialize.PlatformConfig;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
-import com.xzjmyk.pm.activity.bean.ConfigBean;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.db.DatabaseManager;
+import com.core.db.DatabaseManager;
 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.core.db.DBOpenHelper;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 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;
+import com.core.app.MyActivityManager;
 
 import org.apache.http.cookie.Cookie;
 
@@ -59,16 +59,14 @@ import java.io.File;
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 public class MyApplication extends BaseApplication {
-    /**
-     * @注释：记录Cookie
-     */
+  
     public String JSESSION_B2B;
-    public static Cookie cookie;
+//    public static Cookie cookie;
     public static Cookie cookieERP;
 
     public static RequestQueue mRequestQueue;
     public static HttpUtils mHttpUtils;
-    public static DbUtils mDbUtils;
+   
 
     private static MyApplication INSTANCE = null;
 
@@ -144,11 +142,11 @@ public class MyApplication extends BaseApplication {
         // 初始化网络监听
         mNetWorkObservable = new NetWorkObservable(this);
         initErpDB();
-        try {
-            com.xzjmyk.pm.activity.db.Constants.cleanRed(this);
+    /*    try {
+            com.core.app.Constants.cleanRed(this);
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
-        }
+        }*/
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override
             public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
@@ -171,7 +169,7 @@ public class MyApplication extends BaseApplication {
 
 
     private void initErpDB() {
-        DatabaseManager.initializeInstance(DBOpenHelper.getInstance());
+        DatabaseManager.initializeInstance(DBOpenHelper.getInstance(this));
     }
 
     /**
@@ -242,7 +240,7 @@ public class MyApplication extends BaseApplication {
 
     public BdLocationHelper getBdLocationHelper() {
         if (mBdLocationHelper == null)
-            mBdLocationHelper = new BdLocationHelper();
+            mBdLocationHelper = new BdLocationHelper(this);
         mBdLocationHelper.requestLocation();
         return mBdLocationHelper;
     }
@@ -435,15 +433,15 @@ public class MyApplication extends BaseApplication {
         JSESSION_B2B = jSESSION_B2B;
     }
 
-    public static Cookie getCookie() {
-        return cookie;
-    }
-
-    public static void setCookie(Cookie cookie) {
-        MyApplication.cookie = cookie;
-    }
+//    public static Cookie getCookie() {
+//        return cookie;
+//    }
+//
+//    public static void setCookie(Cookie cookie) {
+//        MyApplication.cookie = cookie;
+//    }
 
-    public void clearWebViewCache() {
+/*    public void clearWebViewCache() {
         Log.i("clearWebViewCache", "clearWebViewCache");
         // 清理WebView缓存数据库
         try {
@@ -468,7 +466,7 @@ public class MyApplication extends BaseApplication {
         if (appCacheDir.exists()) {
             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/adapter/AllSubscriptionAdapter.java

@@ -20,7 +20,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
@@ -129,7 +129,7 @@ public class AllSubscriptionAdapter extends BaseAdapter {
      */
     private void sendApplySubs(int position) {
         progressDialog.show();
-        String applyUrl = Constants.getAppBaseUrl(mContext) + "common/charts/vastAddSubsApply.action";
+        String applyUrl = CommonUtil.getAppBaseUrl(mContext) + "common/charts/vastAddSubsApply.action";
         Map<String, Object> params = new HashMap<>();
         params.put("ids", mSubscriptionNumbers.get(position).getId());
         params.put("caller", "VastAddSubsApply");

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

@@ -15,7 +15,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
@@ -112,7 +112,7 @@ public class AllSubscriptionNumbersAdapter extends BaseAdapter {
      */
     private void sendApplySubs(int position) {
         progressDialog.show();
-        String applyUrl = Constants.getAppBaseUrl(mContext) + "common/charts/vastAddSubsApply.action";
+        String applyUrl = CommonUtil.getAppBaseUrl(mContext) + "common/charts/vastAddSubsApply.action";
         Map<String,Object> params = new HashMap<>();
         params.put("ids",mSubscriptionNumbers.get(position).getId());
         params.put("caller","VastAddSubsApply");

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

@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;

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

@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;

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

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -21,7 +21,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
@@ -153,7 +153,7 @@ public class MySubscriptionAdapter extends BaseAdapter {
      */
     private void sendRemoveRequest(int position) {
         progressDialog.show();
-        String subsUrl = Constants.getAppBaseUrl(mContext) + "common/charts/removeSubsMans.action";
+        String subsUrl = CommonUtil.getAppBaseUrl(mContext) + "common/charts/removeSubsMans.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(mContext, "erp_username"));
         params.put("numIds", mPersonalSubscriptionBeans.get(position).getNUM_ID());

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

@@ -11,9 +11,9 @@ 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.core.model.Friend;
+import com.core.model.NewFriendMessage;
+import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 

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

@@ -27,10 +27,10 @@ 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;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;

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

@@ -10,7 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;

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

@@ -16,7 +16,7 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.PlatDailyBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;

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

@@ -28,10 +28,10 @@ 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;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;

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

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -11,9 +11,9 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 
 import java.text.DecimalFormat;

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

@@ -8,7 +8,7 @@ import android.os.Message;
 import android.text.TextUtils;
 
 import com.common.file.CacheFileUtil;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 
 import java.io.File;
 import java.util.Timer;

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

@@ -5,7 +5,7 @@ import android.text.TextUtils;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import com.xzjmyk.pm.activity.db.dao.AreasDao;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -6,6 +6,7 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.core.model.XmppMessage;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import com.xzjmyk.pm.activity.db.dao.ChatMessageDaoImpl;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SearchPoiParam.java

@@ -9,7 +9,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.baidu.mapapi.model.LatLng;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 
 /**
  * 调用地图显示界面，由于多处调用，所以参数太多，整理为一个参数类中

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 
 /**
  * 名片盒的Ui更新

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

@@ -5,8 +5,8 @@ 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.core.app.AppConfig;
+import com.core.app.MyApplication;
 
 /**
  * 用于聊天消息的广播，更新MainActivity Tab栏显示的未读数量 和 消息界面数据的更新

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 
 /**
  * 群聊UI的更新

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/SQLiteHelper.java

@@ -2,20 +2,20 @@ package com.xzjmyk.pm.activity.db;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
+import com.core.model.Friend;
+import com.core.model.User;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.AuthCode;
-import com.xzjmyk.pm.activity.bean.Company;
-import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.bean.MyPhoto;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.bean.VideoFile;
-import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.core.model.AuthCode;
+import com.core.model.Company;
+
+import com.core.model.MyPhoto;
+import com.core.model.VideoFile;
+import com.core.model.CircleMessage;
+import com.core.model.NewFriendMessage;
 
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -7,7 +7,7 @@ import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.dao.GenericRawResults;
 import com.j256.ormlite.stmt.QueryBuilder;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 

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

@@ -4,8 +4,8 @@ import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.DeleteBuilder;
-import com.xzjmyk.pm.activity.bean.AuthCode;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.model.AuthCode;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;

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

@@ -11,7 +11,7 @@ import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.stmt.UpdateBuilder;
 import com.j256.ormlite.table.DatabaseTableConfig;
 import com.xzjmyk.pm.activity.BuildConfig;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.db.SQLiteRawUtil;

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

@@ -12,8 +12,8 @@ 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.MyApplication;
-import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
+import com.core.app.MyApplication;
+import com.core.model.CircleMessage;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;

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

@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 
 import java.util.List;
 

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

@@ -15,15 +15,16 @@ import com.j256.ormlite.stmt.DeleteBuilder;
 import com.j256.ormlite.stmt.PreparedQuery;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.stmt.UpdateBuilder;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.AttentionUser;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.AttentionUser;
+import com.core.model.Friend;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.bean.message.MucRoom;
 import com.xzjmyk.pm.activity.bean.message.MucRoomMember;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
-import com.xzjmyk.pm.activity.bean.message.XmppMessage;
+import com.core.model.NewFriendMessage;
+import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
 import com.xzjmyk.pm.activity.sp.TableVersionSp;
@@ -1196,4 +1197,24 @@ public class FriendDao {
             e.printStackTrace();
         }
     }
+
+
+    /**
+     * 快捷方法
+     *
+     * @param userId
+     * @param nickName
+     * @return
+     */
+    public  String getShowName(String userId, String nickName) {
+        User loginUser = MyApplication.getInstance().mLoginUser;
+        if (loginUser == null || TextUtils.isEmpty(loginUser.getUserId())) {
+            return nickName;
+        }
+        String showName = getRemarkName(loginUser.getUserId(), userId);
+        if (TextUtils.isEmpty(showName)) {
+            showName = nickName;
+        }
+        return showName;
+    }
 }

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

@@ -7,8 +7,9 @@ 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.core.app.AppConfig;
+import com.core.db.DBOpenHelper;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.entity.InAndExitTimeEntity;
 
 import java.util.ArrayList;
@@ -30,7 +31,7 @@ public class InAndExitTimeDao {
     }
 
     private InAndExitTimeDao(){
-        helper =DBOpenHelper.getInstance();
+        helper =DBOpenHelper.getInstance(MyApplication.getInstance());
     }
     //获取全部时间数据
     public List<InAndExitTimeEntity> queryAll(){

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

@@ -7,7 +7,7 @@ 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.core.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.MessageModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;

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

@@ -9,9 +9,9 @@ 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.core.app.AppConfig;
+import com.core.app.MyApplication;
+import com.core.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;

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

@@ -6,8 +6,8 @@ import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.DeleteBuilder;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.bean.MyPhoto;
+import com.core.app.MyApplication;
+import com.core.model.MyPhoto;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;

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

@@ -7,8 +7,8 @@ import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.DeleteBuilder;
 import com.j256.ormlite.stmt.PreparedQuery;
 import com.j256.ormlite.stmt.UpdateBuilder;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.model.NewFriendMessage;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;

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

@@ -6,7 +6,7 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
-import com.xzjmyk.pm.activity.db.DatabaseManager;
+import com.core.db.DatabaseManager;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -7,10 +7,10 @@ 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.core.app.AppConfig;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.message.SubMessage;
-import com.xzjmyk.pm.activity.db.DatabaseManager;
+import com.core.db.DatabaseManager;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 

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

@@ -3,7 +3,7 @@ package com.xzjmyk.pm.activity.db.dao;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.TableConstant;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 

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

@@ -7,8 +7,8 @@ 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.core.app.AppConfig;
+import com.core.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.UUStepDataEntity;
 
 import java.util.ArrayList;

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

@@ -9,9 +9,9 @@ import com.j256.ormlite.dao.CloseableIterator;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.UpdateBuilder;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.bean.Company;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.app.MyApplication;
+import com.core.model.Company;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;

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

@@ -4,9 +4,9 @@ import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.QueryBuilder;
-import com.xzjmyk.pm.activity.bean.VideoFile;
+import com.core.model.VideoFile;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -8,7 +8,7 @@ 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.core.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

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

@@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase;
 
 import com.common.LogUtil;
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.db.DatabaseManager;
+import com.core.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;

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

@@ -1,98 +0,0 @@
-package com.xzjmyk.pm.activity.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.xzjmyk.pm.activity.R;
-
-public class BaseFragment extends Fragment {
-
-	public String TAG() {
-		return this.getClass().getSimpleName();
-	}
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		Log.d("roamer", TAG() + " onAttach");
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		Log.d("roamer", TAG() + " onCreate");
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		Log.d("roamer", TAG() + " onCreateView");
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		Log.d("roamer", TAG() + " onActivityCreated");
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		Log.d("roamer", TAG() + " onStart");
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		Log.d("roamer", TAG() + " onResume");
-	}
-
-	@Override
-	public void onPause() {
-		super.onPause();
-		Log.d("roamer", TAG() + " onPause");
-	}
-
-	@Override
-	public void onStop() {
-		super.onStop();
-		Log.d("roamer", TAG() + " onStop");
-	}
-
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-		Log.d("roamer", TAG() + " onDestroyView");
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		Log.d("roamer", TAG() + " onDestroy");
-	}
-
-	@Override
-	public void onDetach() {
-		super.onDetach();
-		Log.d("roamer", TAG() + " onDetach");
-	}
-
-
-	@Override
-	public void startActivity(Intent intent) {
-		super.startActivity(intent);
-		getActivity().overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
-	}
-
-	@Override
-	public void startActivityForResult(Intent intent, int requestCode) {
-		super.startActivityForResult(intent, requestCode);
-		getActivity().overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
-	}
-}

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

@@ -46,13 +46,13 @@ 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;
+import com.core.app.AppConfig;
+import com.core.app.MyApplication;
+import com.core.net.NetWorkObservable;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.core.model.User;
+import com.core.model.CircleMessage;
+import com.core.model.NewFriendMessage;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
@@ -82,7 +82,7 @@ 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;
+import com.core.net.volley.FastVolley;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
@@ -314,7 +314,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 if (mMeFragment == null) {
                     mMeFragment = new MeFragment();
                 }
-                CommonUtil.setSharedPreferences(ct, com.xzjmyk.pm.activity.db.Constants.NEW_ME_TAG, true);
+                CommonUtil.setSharedPreferences(ct, com.core.app.Constants.NEW_ME_TAG, true);
                 changeFragment(mMeFragment, TAG_ME);//我
                 getSupportActionBar().setTitle(R.string.me);
             }
@@ -373,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.db.Constants.NEW_ME_TAG, false)) {
+        } else if (CommonUtil.getSharedPreferencesBoolean(ct, com.core.app.Constants.NEW_ME_TAG, false)) {
             unWorkReadTV.setVisibility(GONE);
         }
         if (mMeFragment == null) return;
@@ -912,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.db.Constants.NEW_ME_TAG, false) ? View.GONE : View.VISIBLE);
+        unWorkReadTV.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, com.core.app.Constants.NEW_ME_TAG, false) ? View.GONE : View.VISIBLE);
         Log.i("new_function_notice", new_function_notice + "");
 
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;

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

@@ -11,7 +11,7 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -16,12 +16,12 @@ 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.core.app.AppConfig;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.ConfigBean;
+import com.core.model.ConfigBean;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;

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

@@ -8,13 +8,14 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.sp.UserSp;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.base.ActivityStack;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-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.ActionBackActivity;
-import com.xzjmyk.pm.activity.ui.base.ActivityStack;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+
 
 /**
  * 进入到此界面的Activity只可能是4中用户状态 STATUS_USER_TOKEN_OVERDUE //本地Token过期 STATUS_USER_NO_UPDATE //数据不完整

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

@@ -16,14 +16,14 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.AttentionUser;
-import com.xzjmyk.pm.activity.bean.MyPhoto;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
+import com.core.model.AttentionUser;
+import com.core.model.MyPhoto;
+import com.core.model.User;
+import com.core.model.CircleMessage;
 import com.xzjmyk.pm.activity.bean.message.MucRoom;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.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;
@@ -222,7 +222,7 @@ public class DataDownloadActivity extends BaseActivity {
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
         String commpany = CommonUtil.getSharedPreferences(ct, "erp_commpany");
         String lastdate = "";
-        String url = Constants.getAppBaseUrl(this) + "mobile/getAllHrorgEmps.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/getAllHrorgEmps.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("master", master);
         param.put("lastdate", lastdate);

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

@@ -21,17 +21,20 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 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.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -143,7 +146,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void login() {
-        MyApplication.cookie = null;
+   
         final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
         final String password = mPasswordEdit.getText().toString().trim();
         PreferenceUtils.putString(this, PASS_WORDS, password);
@@ -203,6 +206,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 if (result.getResultCode() == Result.CODE_SUCCESS) {
                     success = LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, result);// 设置登陆用户信息
                 }
+                LogUtil.d("LoginInfo","success:"+success);
                 if (success) {// 登陆IM成功
                     login_manage(phoneNumber, password);//登录管理平台
                     

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

@@ -16,21 +16,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.common.ui.ProgressDialogUtil;
+import com.core.base.ActivityStack;
+import com.core.app.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.core.model.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
-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.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 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/account/RegisterActivity.java

@@ -18,7 +18,7 @@ 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.core.model.AuthCode;
 import com.xzjmyk.pm.activity.db.dao.AuthCodeDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;

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

@@ -29,11 +29,11 @@ import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 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.core.model.User;
 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;

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

@@ -11,8 +11,8 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 
-import com.xzjmyk.pm.activity.AppConfig;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.AppConfig;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 
 public class ActionBackActivity extends StackActivity {
@@ -167,15 +167,15 @@ public class ActionBackActivity extends StackActivity {
 
     @Override
     public void startActivity(Intent intent) {
-        if (intent.getAction() != null){
-            if (!intent.getAction().equals(Intent.ACTION_MAIN)){
+        if (intent.getAction() != null) {
+            if (!intent.getAction().equals(Intent.ACTION_MAIN)) {
                 super.startActivity(intent);
                 overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
-            }else {
+            } else {
                 super.startActivity(intent);
                 overridePendingTransition(R.anim.anim_to_main_in, R.anim.anim_to_main_out);
             }
-        }else {
+        } else {
             super.startActivity(intent);
             overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
         }
@@ -190,7 +190,7 @@ public class ActionBackActivity extends StackActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        overridePendingTransition(R.anim.anim_activity_back_in,R.anim.anim_activity_back_out);
+        overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
     }
 
     @Override

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

@@ -18,12 +18,12 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.volley.FastVolley;
+import com.core.net.volley.FastVolley;
 
 import java.lang.reflect.Field;
 import java.util.Locale;
@@ -90,7 +90,7 @@ public abstract class BaseActivity extends ActionBackActivity {
 
         //重启之后恢复到之前的语言
         switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
-        
+
         // SystemUtil.setSystemBarTint(this);
 
     }
@@ -187,31 +187,30 @@ public abstract class BaseActivity extends ActionBackActivity {
     }
 
 
-
     public void ToastMessage(String message) {
         ViewUtil.ToastMessage(this, message);
     }
-    
-    
+
+
     /**
-      * @desc:切换语言
-      * @author：Arison on 2017/5/18
-      */
+     * @desc:切换语言
+     * @author：Arison on 2017/5/18
+     */
     protected void switchLanguage(String language) {
         Resources resources = getResources();
         Configuration config = resources.getConfiguration();
         DisplayMetrics dm = resources.getDisplayMetrics();
         if (language.equals("en")) {
             config.locale = Locale.ENGLISH;
-        } else if(language.equals("rCN")) {
+        } else if (language.equals("rCN")) {
             config.locale = Locale.SIMPLIFIED_CHINESE;
-        }else if(language.equals("rTW")){
+        } else if (language.equals("rTW")) {
             config.locale = Locale.TRADITIONAL_CHINESE;
-        }else if(language.equals("sys")){
+        } else if (language.equals("sys")) {
             config.locale = Locale.getDefault();
         }
-        LogUtil.d("MainActivity"+"当前语言版本模式："+language);
+        LogUtil.d("MainActivity" + "当前语言版本模式：" + language);
         resources.updateConfiguration(config, dm);
-        PreferenceUtils.putString("language",language);
+        PreferenceUtils.putString("language", language);
     }
 }

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

@@ -3,14 +3,11 @@ package com.xzjmyk.pm.activity.ui.base;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.base.ActivityStack;
+import com.core.app.MyApplication;
+
+
 
-/**
- * 加入了堆栈的Activity
- * 
- * @author Dean Tao
- * 
- */
 public class StackActivity extends DefaultResourceActivity {
 
 	@Override

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

@@ -23,12 +23,12 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.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.core.model.Friend;
+import com.core.model.NewFriendMessage;
+import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;

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

@@ -13,7 +13,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.RadioButton;
 
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.core.model.NewFriendMessage;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;

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

@@ -25,13 +25,13 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.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.core.model.AttentionUser;
+import com.core.model.Friend;
+import com.core.model.NewFriendMessage;
+import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;

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

@@ -19,10 +19,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;

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

@@ -45,14 +45,14 @@ import com.common.ui.ProgressDialogUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.AddAttentionResult;
-import com.xzjmyk.pm.activity.bean.AttentionUser;
-import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
-import com.xzjmyk.pm.activity.bean.message.XmppMessage;
+import com.core.model.AttentionUser;
+import com.core.model.Friend;
+import com.core.model.User;
+import com.core.model.NewFriendMessage;
+import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;

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

@@ -38,12 +38,12 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
-import com.xzjmyk.pm.activity.bean.MyPhoto;
+import com.core.model.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;

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

@@ -25,11 +25,11 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
-import com.xzjmyk.pm.activity.bean.MyPhoto;
-import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
+import com.core.model.MyPhoto;
+import com.core.model.CircleMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
@@ -41,7 +41,7 @@ import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;

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

@@ -17,7 +17,7 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
 import com.xzjmyk.pm.activity.audio.RecordController;

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

@@ -24,10 +24,10 @@ 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;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.model.Friend;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
@@ -690,7 +690,7 @@ public class PMsgDetailActivity extends BaseActivity {
 			mToNickNameTv.setText("");
 		} else {
 			mReplayLayout.setVisibility(View.VISIBLE);
-			mToNickNameTv.setText(Friend.getShowName(mCommentReplyCache.toUserId, mCommentReplyCache.toNickName));
+			mToNickNameTv.setText(FriendDao.getInstance().getShowName(mCommentReplyCache.toUserId, mCommentReplyCache.toNickName));
 		}
 	}
 
@@ -749,10 +749,10 @@ public class PMsgDetailActivity extends BaseActivity {
 			final Comment comment = datas.get(position);
 
 			AvatarHelper.getInstance().displayAvatar(comment.getUserId(), holder.avatar_img, true);
-			String showName= Friend.getShowName(comment.getUserId(), comment.getNickName());
+			String showName= FriendDao.getInstance().getShowName(comment.getUserId(), comment.getNickName());
 			holder.content_tv.setText(showName + ":" + comment.getBody());
 			if (comment.isReplaySomeBody()) {
-				holder.replay_tv.setText(getString(R.string.task_reply) + " " + Friend.getShowName(comment.getToUserId(), comment.getToNickname()));
+				holder.replay_tv.setText(getString(R.string.task_reply) + " " + FriendDao.getInstance().getShowName(comment.getToUserId(), comment.getToNickname()));
 			} else {
 				holder.replay_tv.setText("");
 			}

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

@@ -38,12 +38,12 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PersonalQzoneAdapter;
-import com.xzjmyk.pm.activity.bean.MyPhoto;
+import com.core.model.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;

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

@@ -21,7 +21,7 @@ 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;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;

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

@@ -21,7 +21,7 @@ import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.model.LatLng;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 
 public class SendBaiDuLocate extends FragmentActivity {

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

@@ -35,7 +35,7 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;

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

@@ -32,7 +32,7 @@ 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;

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

@@ -41,16 +41,16 @@ 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;
+import com.core.app.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.AddAttentionResult;
-import com.xzjmyk.pm.activity.bean.AttentionUser;
-import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
-import com.xzjmyk.pm.activity.bean.message.XmppMessage;
+import com.core.model.AttentionUser;
+import com.core.model.Friend;
+import com.core.model.User;
+import com.core.model.NewFriendMessage;
+import com.core.model.XmppMessage;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;

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

@@ -21,12 +21,13 @@ import android.widget.TextView;
 
 import com.common.system.DisplayUtil;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.model.Friend;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -285,7 +286,7 @@ public class PMsgDetailHeaderView extends LinearLayout {
 				getContext().startActivity(intent);
 			}
 		});
-		mNicknameTv.setText(Friend.getShowName(mPublicMessage.getUserId(), mPublicMessage.getNickName()));
+		mNicknameTv.setText(FriendDao.getInstance().getShowName(mPublicMessage.getUserId(), mPublicMessage.getNickName()));
 		mTimeTv.setText(TimeUtils.getFriendlyTimeDesc(getContext(), (int) mPublicMessage.getTime()));
 		mContentTv.setText(mPublicMessage.getBody().getText());
 		mListenCountTv.setText(mPublicMessage.getPlay() + "");

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

@@ -29,10 +29,10 @@ import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
@@ -49,7 +49,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.AutoErpService;

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

@@ -27,11 +27,11 @@ import com.common.ui.ProgressDialogUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.UUFriendSortAdapter;
-import com.xzjmyk.pm.activity.bean.AttentionUser;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.AttentionUser;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;

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

@@ -12,12 +12,12 @@ import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.AppConfig;
+import com.core.app.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.UserAdapter;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;

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

@@ -43,7 +43,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.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;
@@ -516,7 +516,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
         params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
         params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         params.addBodyParameter("file", finalFile);
-        String url = Constants.getAppBaseUrl(ct) + "/mobile/uploadAttachs.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "/mobile/uploadAttachs.action";
         Log.i("url", "url:" + url);
         Log.i("url", "file:" + finalFile.getAbsolutePath());
         HttpUtils http = new HttpUtils();
@@ -737,7 +737,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
      */
     public void sendDataToServer(String formStore) {
 //		progressDialog.show();
-        String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Log.i(TAG, url);
         Log.i(TAG, formStore);
         Map<String, Object> param = new HashMap<String, Object>();

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

@@ -32,10 +32,10 @@ import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.bean.User;
+import com.core.model.User;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;

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

@@ -29,7 +29,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.ComDocGriddataOutAdapter;
 import com.xzjmyk.pm.activity.adapter.CommonDocApprovalFlowAdapter;
@@ -37,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.db.Constants;
+import com.core.app.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;
@@ -241,7 +241,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             }
             //请求获取单据提交内容数据
             progressDialog.show();
-            String docmsg_url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
+            String docmsg_url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
             Map<String, Object> param_am = new HashMap<>();
             param_am.put("caller", mCaller);
             param_am.put("id", mkeyValue);
@@ -545,7 +545,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         }
 
         //请求获取单据审批流数据
-        String url = Constants.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
+        String url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
         Map<String, Object> param = new HashMap<>();
         param.put("caller", mCaller);
         param.put("keyValue", mkeyValue);
@@ -889,14 +889,14 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
                                         String url = "";
                                         if ("ExtraWork$".equals(mCaller)){ // 新的加班单反提交
-                                            url = Constants.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                                            url = CommonUtil.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
                                             ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, NEW_DOC_RESUB_SUCCESSFUL, null, null, "post");
 
                                         }else if("FeePlease!FYBX".equals(mCaller)){ // 报销单
-                                            url = Constants.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
+                                            url = CommonUtil.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
                                             ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x01, null, null, "post");
                                         }else { // 通用老的反提交
-                                            url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
+                                            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonres.action";
                                             ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_RESUB_SUCCESSFUL, null, null, "post");
                                         }
 
@@ -944,13 +944,13 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                     headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
                                     String url = "";
                                     if ("ExtraWork$".equals(mCaller)){ // 新的加班单反提交
-                                        url = Constants.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                                        url = CommonUtil.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
                                         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, New_DOC_REDELETE_SUCCESSFUL, null, null, "post");
                                     }else if ("FeePlease!FYBX".equals(mCaller)){
-                                        url = Constants.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
+                                        url = CommonUtil.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
                                         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x02, null, null, "post");
                                     }else { // 通用老的反提交s
-                                        url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
+                                        url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonres.action";
                                         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_REDELETE_SUCCESSFUL, null, null, "post");
                                     }
                                     }
@@ -1116,7 +1116,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         });
     }
     private String getImageUrl(int id) {
-        return Constants.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id + "&sessionId=" +
+        return CommonUtil.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id + "&sessionId=" +
                 CommonUtil.getSharedPreferences(ct, "sessionId") +
                 "&sessionUser=" + CommonUtil.getSharedPreferences(ct, "erp_username") +
                 "&master=" + CommonUtil.getSharedPreferences(ct, "erp_master");

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.db.Constants;
+import com.core.app.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

@@ -38,9 +38,9 @@ import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
@@ -52,7 +52,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
@@ -741,7 +741,7 @@ public class CompanyContactsActivity extends BaseActivity  {
             rl_empty.setVisibility(View.VISIBLE);
             return;
         }
-        String url = Constants.getAppBaseUrl(this) + "mobile/getAllHrorgEmps.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/getAllHrorgEmps.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("master", master);
         if (lastdate == null) {

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

@@ -33,7 +33,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
@@ -247,7 +247,7 @@ public class DbfindList2Activity extends BaseActivity{
     }
     private void getEmployeeByNet() {
         progressDialog.show();
-        String url = Constants.getAppBaseUrl(ct) + "common/dbfind.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "common/dbfind.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", "Ask4leave");
         params.put("which", "form");

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

@@ -37,7 +37,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.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;
@@ -186,7 +186,7 @@ public class DbfindListActivity extends BaseActivity {
     public void initData() {
         progressDialog.show();
         if (CommonUtil.isNetWorkConnected(this)) {
-            String url = Constants.getAppBaseUrl(ct) + "common/dbfind.action";
+            String url = CommonUtil.getAppBaseUrl(ct) + "common/dbfind.action";
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("caller", "Ask4leave");
             params.put("which", "form");
@@ -295,7 +295,7 @@ public class DbfindListActivity extends BaseActivity {
     public void loadEmployees(String em_name) {
         progressDialog.show();
         if (CommonUtil.isNetWorkConnected(this)) {
-            String url = Constants.getAppBaseUrl(ct) + "mobile/QueryEmployee.action";
+            String url = CommonUtil.getAppBaseUrl(ct) + "mobile/QueryEmployee.action";
             Map<String, Object> param = new HashMap<String, Object>();
             param.put("em_name", em_name);
             String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");

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

@@ -30,13 +30,13 @@ import com.lidroid.xutils.exception.HttpException;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
@@ -135,7 +135,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     if (fileUrl.length() > 2) {
                         lay_voice_task.setVisibility(View.VISIBLE);
                         fileUrl = fileUrl.substring(1, fileUrl.length() - 1).split(", ")[0];
-                        String url = Constants.getAppBaseUrl(ct);
+                        String url = CommonUtil.getAppBaseUrl(ct);
                         String ipaddress = url.split("//")[1].split("/")[0];
                         String file_url = "http://" + ipaddress + "/" + "postattach" + fileUrl.split("postattach")[1];
                         downFileToSD(fileUrl, file_url);
@@ -220,7 +220,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         String attachs = intent.getStringExtra("attachs");
         if (!StringUtil.isEmpty(attachs)) {
             // 加载语音文件
-            String url = Constants.getAppBaseUrl(ct) + "/common/downloadbyId.action?id=" + attachs.split(";")[0];
+            String url = CommonUtil.getAppBaseUrl(ct) + "/common/downloadbyId.action?id=" + attachs.split(";")[0];
             downFileToSD("/uu/recorder_download/" + attachs.split(";")[0] + ".amr", url);
         } else {
             // 没有语音文件
@@ -322,7 +322,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
 
     public void sendDataToServer(String url, Map<String, String> param) {
 //		progressDialog.show();
-        url = Constants.getAppBaseUrl(ct) + url;
+        url = CommonUtil.getAppBaseUrl(ct) + url;
         Log.i(TAG, url);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.startNetThread(ct, url, param, mhandler, Constants.LOAD_SUCCESS, null, null, "post");
@@ -330,7 +330,7 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
 
     public void sendDataToServer(String url, Map<String, Object> param, int what) {
 //		progressDialog.show();
-        url = Constants.getAppBaseUrl(ct) + url;
+        url = CommonUtil.getAppBaseUrl(ct) + url;
         Log.i(TAG, url);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

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

@@ -23,7 +23,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.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;
@@ -393,7 +393,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 		String gridCondition = intent.getStringExtra("gridCondition");
 		String caller = intent.getStringExtra("caller");
 		if (!StringUtil.isEmpty(caller)) {
-			String url = Constants.getAppBaseUrl(this)
+			String url = CommonUtil.getAppBaseUrl(this)
 					+ "mobile/common/getPanel.action";
 			String sessionId = CommonUtil.getSharedPreferences(this,
 					"sessionId");
@@ -515,7 +515,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 
 	/** @注释：获取主键ID */
 	public void getPreHttpData() {
-		String url = Constants.getAppBaseUrl(ct) + "common/getId.action";
+		String url = CommonUtil.getAppBaseUrl(ct) + "common/getId.action";
 		Map<String,Object> params = new HashMap<String,Object>();
 		params.put("seq", "VACATION_SEQ");
 		params.put("sessionId",
@@ -528,7 +528,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 
 	/** @注释：获取Code */
 	public void getCodeHttpData() {
-		String url = Constants.getAppBaseUrl(ct)
+		String url = CommonUtil.getAppBaseUrl(ct)
 				+ "common/getCodeString.action";
 		Map<String,Object> params = new HashMap<String,Object>();
 		params.put("type", "2");
@@ -544,7 +544,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 	public void httpSave() {
 		ExtraLeaveEntity entity = getSaveJsonData();
 		// 路径
-		String url = Constants.getAppBaseUrl(ct)
+		String url = CommonUtil.getAppBaseUrl(ct)
 				+ "hr/attendance/saveSpeAttendance.action";
 		Map<String,Object> params = new HashMap<String,Object>();
 
@@ -584,7 +584,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 	}
 
 	public void httpCommit() {
-		String url = Constants.getAppBaseUrl(ct)
+		String url = CommonUtil.getAppBaseUrl(ct)
 				+ "hr/attendance/submitSpeAttendance.action";
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("id", String.valueOf(va_id));
@@ -598,7 +598,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 	}
 
 	public void httpUpdate() {
-		String url = Constants.getAppBaseUrl(ct)
+		String url = CommonUtil.getAppBaseUrl(ct)
 				+ "hr/attendance/updateSpeAttendance.action";
 		Map<String,Object> params = new HashMap<String,Object>();
 		params.put("id", String.valueOf(va_id));
@@ -617,7 +617,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 	}
 
 	public void httpUnCommit() {
-		String url = Constants.getAppBaseUrl(ct)
+		String url = CommonUtil.getAppBaseUrl(ct)
 				+ "hr/attendance/resSubmitSpeAttendance.action";
 		Map<String,Object> params = new HashMap<String,Object>();
 		params.put("id", String.valueOf(va_id));
@@ -768,7 +768,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 	
 	public void loadDataForServer(String field,int what){
     	Log.i("leave", "what="+what);
-    	String url=Constants.getAppBaseUrl(ct)+"mobile/common/getCombo.action";
+    	String url=CommonUtil.getAppBaseUrl(ct)+"mobile/common/getCombo.action";
 		Map<String, String> param = new HashMap<String, String>();
 		param.put("caller", "SpeAttendance");
 		param.put("field", field);

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

@@ -18,9 +18,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SchedultAdapter;
@@ -28,7 +28,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
@@ -164,7 +164,7 @@ public class InformActivity extends BaseActivity {
     private void loadData() {
         hClient = new HttpClient();
         String reString = null;
-        String url = Constants.getAppBaseUrl(this) + "mobile/getallprocess.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/getallprocess.action";
         Map<String, String> param = new HashMap<String, String>();
         param.put("employeeCode", CommonUtil.getSharedPreferences(this, "erp_username"));
         param.put("currentMaster", CommonUtil.getSharedPreferences(this, "erp_master"));

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

@@ -38,7 +38,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.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;
@@ -635,7 +635,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
 
         if (!StringUtil.isEmpty(caller)) {
             //需要初始化编辑界面
-            String url = Constants.getAppBaseUrl(this) +
+            String url = CommonUtil.getAppBaseUrl(this) +
                     "mobile/common/getPanel.action";
             String sessionId = CommonUtil.getSharedPreferences(this, "sessionId");
             Map<String, Object> params = new HashMap<String, Object>();
@@ -677,7 +677,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
      * @注释：获取主键ID
      */
     public void getPreHttpData() {
-        String url = Constants.getAppBaseUrl(ct) + "common/getId.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "common/getId.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("seq", "SpeAttendance_SEQ");
         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -688,7 +688,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
     }
 
     public void getCodeHttpData() {
-        String url = Constants.getAppBaseUrl(ct) +
+        String url = CommonUtil.getAppBaseUrl(ct) +
                 "common/getCodeString.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("type", "2");
@@ -735,7 +735,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
      * @注释：提交
      */
     public void httpCommit() {
-        String url = Constants.getAppBaseUrl(ct) + "oa/check/submitVacation.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "oa/check/submitVacation.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
         params.put("caller", "Ask4Leave");
@@ -749,7 +749,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
      * @注释：反提交
      */
     public void UnhttpCommit() {
-        String url = Constants.getAppBaseUrl(ct) +
+        String url = CommonUtil.getAppBaseUrl(ct) +
                 "oa/check/resSubmitVacation.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
@@ -765,7 +765,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
      * @注释：删除
      */
     public void httpDelete() {
-        String url = Constants.getAppBaseUrl(ct) +
+        String url = CommonUtil.getAppBaseUrl(ct) +
                 "oa/check/deleteVacation.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
@@ -780,7 +780,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
      * @注释：更新
      */
     public void httpUpdate() {
-        String url = Constants.getAppBaseUrl(ct) +
+        String url = CommonUtil.getAppBaseUrl(ct) +
                 "oa/check/updateVacation.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
@@ -947,7 +947,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
 
     public void loadDataForServer(String field, int what) {
         Log.i("leave", "what=" + what);
-        String url = Constants.getAppBaseUrl(ct) + "mobile/common/getCombo.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "mobile/common/getCombo.action";
         Map<String, String> param = new HashMap<String, String>();
         param.put("caller", "Ask4Leave");
         param.put("field", field);

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

@@ -19,7 +19,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -77,7 +77,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 	}
 
 	private void loadNewsData(int id) {
-		String url= Constants.getAppBaseUrl(ct)+"oa/news/getNews.action";
+		String url= CommonUtil.getAppBaseUrl(ct)+"oa/news/getNews.action";
         final Map<String,Object> param=new HashMap<>();
         param.put("caller", "News");
         param.put("id", id);
@@ -87,7 +87,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 	}
 	
 	private void loadNoticeData(int id) {
-		String url=Constants.getAppBaseUrl(ct)+"/oa/note/getNote.action";
+		String url=CommonUtil.getAppBaseUrl(ct)+"/oa/note/getNote.action";
         final Map<String,Object> param=new HashMap<>();
         param.put("caller", "Note");
         param.put("id", id);

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

@@ -24,15 +24,15 @@ 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.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
@@ -145,7 +145,7 @@ public class NewsTwoActivity extends BaseActivity {
     public void initData() {
         mlist.setVisibility(View.GONE);
         progress_bar.setVisibility(View.VISIBLE);
-        String url = Constants.getAppBaseUrl(ct) + "common/desktop/news/getNews.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/news/getNews.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("page", currentpage);
         param.put("pageSizepageSize",10);

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

@@ -20,15 +20,15 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
@@ -156,13 +156,13 @@ public class NoticesActivity extends BaseActivity {
         param.put("pageSize",10);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (getIntent().getIntExtra("type", 0) == 1) {
-            url = Constants.getAppBaseUrl(ct) + "common/desktop/note/inform.action";
+            url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/note/inform.action";
             getSupportActionBar().setTitle("通知");
             String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
             // 表示已读
             FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NOTICE);
         } else {
-            url = Constants.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
+            url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
             getSupportActionBar().setTitle("公告");
             String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
             // 表示已读

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

@@ -26,7 +26,7 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;

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

@@ -45,7 +45,7 @@ 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
@@ -337,7 +337,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		if (hl_adapter!=null) {
 			hl_adapter.notifyDataSetChanged();
 		}
-		url= Constants.getAppBaseUrl(this)+"mobile/common/getStatsByConfig.action";
+		url= CommonUtil.getAppBaseUrl(this)+"mobile/common/getStatsByConfig.action";
 
 		String sessionId= CommonUtil.getSharedPreferences(this, "sessionId");
 		progressDialog.show();

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

@@ -22,7 +22,7 @@ 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.core.app.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;
@@ -180,7 +180,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 		String formCondition = intent.getStringExtra("formCondition");
 		String gridCondition = intent.getStringExtra("gridCondition");
 		String sessionId = CommonUtil.getSharedPreferences(this, "sessionId");
-		url = Constants.getAppBaseUrl(this) + "mobile/common/getPanel.action";
+		url = CommonUtil.getAppBaseUrl(this) + "mobile/common/getPanel.action";
 	    Log.i("saledetail","url"+url);
 	    Log.i("saledetail","caller"+caller);
 	    Log.i("saledetail","formCondition"+formCondition);
@@ -390,7 +390,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 							@Override
 							public void onClick(View v) {
 								/** @注释：弹出对话框 */
-								String url = Constants.getAppBaseUrl(ct)
+								String url = CommonUtil.getAppBaseUrl(ct)
 										+ "mobile/common/getProductDetail.action";
 								String sessionId = CommonUtil
 										.getSharedPreferences(
@@ -451,7 +451,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 		case R.id.tv_log_handler:
 			String sessionId = CommonUtil.getSharedPreferences(
 					SaleDetailActivity.this, "sessionId");
-			url = Constants.getAppBaseUrl(this)
+			url = CommonUtil.getAppBaseUrl(this)
 					+ "/common/getMessageLogs.action";
 			params.clear();
 			params.put("caller", caller);
@@ -465,7 +465,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 		case R.id.tv_log_approve:
 			sessionId = CommonUtil.getSharedPreferences(
 					SaleDetailActivity.this, "sessionId");
-			url = Constants.getAppBaseUrl(this)
+			url = CommonUtil.getAppBaseUrl(this)
 					+ "mobile/common/getProcessNodes.action";
 			params.clear();
 			params.put("caller", caller);

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

@@ -57,7 +57,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
@@ -489,7 +489,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
         params.put("sessionId", sessionId);
         String result = null;
         try {
-            result = client.sendPostRequest(Constants.getAppBaseUrl(this)
+            result = client.sendPostRequest(CommonUtil.getAppBaseUrl(this)
                     + "mobile/common/list.action", params);
 
             JSONObject resultJsonObject =new JSONObject(result);

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

@@ -19,9 +19,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Friend;
+import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
@@ -29,7 +29,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
@@ -151,7 +151,7 @@ public class ScheduleActivity extends BaseActivity {
         Looper.prepare();
         hClient = new HttpClient();
         String reString = null;
-        String url = Constants.getAppBaseUrl(this) + "mobile/getallprocess.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/getallprocess.action";
         Map<String, String> param = new HashMap<String, String>();
         param.put("employeeCode", CommonUtil.getSharedPreferences(this, "erp_username"));
         param.put("currentMaster", CommonUtil.getSharedPreferences(this, "erp_master"));

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

@@ -35,12 +35,12 @@ import com.common.system.DisplayUtil;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 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.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.Constants;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import org.apache.http.cookie.Cookie;
@@ -225,7 +225,7 @@ public class SubscribeDetailActivity extends BaseActivity {
      */
     private void sendRemoveRequest() {
         progressDialog.show();
-        String subsUrl = Constants.getAppBaseUrl(mContext) + "common/charts/removeSubsMans.action";
+        String subsUrl = CommonUtil.getAppBaseUrl(mContext) + "common/charts/removeSubsMans.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(mContext, "erp_username"));
         params.put("numIds", mSubId);
@@ -241,7 +241,7 @@ public class SubscribeDetailActivity extends BaseActivity {
      */
     private void sendApplySubs() {
         progressDialog.show();
-        String applyUrl = Constants.getAppBaseUrl(mContext) + "common/charts/vastAddSubsApply.action";
+        String applyUrl = CommonUtil.getAppBaseUrl(mContext) + "common/charts/vastAddSubsApply.action";
         Map<String, Object> params = new HashMap<>();
         params.put("ids", mSubId);
         params.put("caller", "VastAddSubsApply");
@@ -381,7 +381,7 @@ public class SubscribeDetailActivity extends BaseActivity {
             }
         });
 
-        subscribeUrl = Constants.getAppBaseUrl(this) + "common/charts/mobilePreview.action?id="
+        subscribeUrl = CommonUtil.getAppBaseUrl(this) + "common/charts/mobilePreview.action?id="
                 + mSubId + "&sessionId=" + CommonUtil.getSharedPreferences(ct, "sessionId")
                 + "&sessionUser=" + CommonUtil.getSharedPreferences(ct, "erp_username")
                 + "&master=" + CommonUtil.getSharedPreferences(ct, "erp_master");

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

@@ -36,7 +36,7 @@ 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.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
@@ -45,7 +45,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 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.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
@@ -541,7 +541,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
     private void loadData() {
         hClient = new HttpClient();
         String reString = null;
-        String url = Constants.getAppBaseUrl(this) + "mobile/getallprocess.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/getallprocess.action";
         Map<String, String> param = new HashMap<String, String>();
         param.put("employeeCode", CommonUtil.getSharedPreferences(this, "erp_username"));
         param.put("currentMaster", CommonUtil.getSharedPreferences(this, "erp_master"));
@@ -784,7 +784,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
      * @注释：状态码
      */
     public void sendResquestForServer(String status, int handlerWhat) {
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
+        String url = CommonUtil.getAppBaseUrl(context) + "common/datalist/data.action";
         Map<String, Object> mparams = new HashMap<>();
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
@@ -812,7 +812,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
      */
     public void sendResquestForServerAll(int handlerWhat, int mCurrentPage) {
         progressDialog.show();
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
+        String url = CommonUtil.getAppBaseUrl(context) + "common/datalist/data.action";
         Map<String, Object> mparams = new HashMap<String, Object>();
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
@@ -833,7 +833,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
      * @注释： 下属任务
      */
     public void sendResquestForServerOther(int handlerWhat) {
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
+        String url = CommonUtil.getAppBaseUrl(context) + "common/datalist/data.action";
         Map<String, Object> mparams = new HashMap<String, Object>();
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
@@ -851,7 +851,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
     }
 
     public void sendDataToServer(String url, Map<String, String> param, int what) {
-        url = Constants.getAppBaseUrl(this) + url;
+        url = CommonUtil.getAppBaseUrl(this) + url;
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
         ViewUtil.startNetThread(this, url, param, handler, what,
                 null, null, "get");

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

@@ -31,7 +31,7 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -45,7 +45,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.TravelUpdateEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.UpdateTravelAddItems;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.db.Constants;
+import com.core.app.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;
@@ -514,7 +514,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
         String caller = intent.getStringExtra("caller");
         if (!StringUtil.isEmpty(caller)) {
             // 需要初始化编辑界面
-            String url = Constants.getAppBaseUrl(this)
+            String url = CommonUtil.getAppBaseUrl(this)
                     + "mobile/common/getPanel.action";
             String sessionId = CommonUtil.getSharedPreferences(this,
                     "sessionId");
@@ -576,7 +576,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
      * @注释：获取主键ID
      */
     public void getPreHttpData() {
-        String url = Constants.getAppBaseUrl(ct) + "common/getId.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "common/getId.action";
         // String url="http://192.168.253.167/ERP/common/getId.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("seq", "FEEPLEASE_SEQ");
@@ -589,7 +589,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
     }
 
     public void getCodeHttpData() {
-        String url = Constants.getAppBaseUrl(ct)
+        String url = CommonUtil.getAppBaseUrl(ct)
                 + "common/getCodeString.action";
         // String url="http://192.168.253.167/ERP/common/getCodeString.action";
         Map<String, Object> params = new HashMap<String, Object>();
@@ -855,7 +855,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
      * @注释：提交
      */
     public void httpCommit() {
-        String url = Constants.getAppBaseUrl(ct)
+        String url = CommonUtil.getAppBaseUrl(ct)
                 + "oa/fee/submitFeePlease.action";
         // String
         // url="http://192.168.253.167/ERP/oa/fee/submitFeePlease.action";
@@ -876,7 +876,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
      * @注释：反提交
      */
     public void httpUncommit() {
-        String url = Constants.getAppBaseUrl(ct)
+        String url = CommonUtil.getAppBaseUrl(ct)
                 + "oa/fee/resSubmitFeePlease.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
@@ -893,7 +893,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
      * @注释：删除
      */
     public void httpDelete() {
-        String url = Constants.getAppBaseUrl(ct)
+        String url = CommonUtil.getAppBaseUrl(ct)
                 + "oa/check/deleteVacation.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
@@ -909,7 +909,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
      * @注释：更新
      */
     public void httpUpdate() {
-        String url = Constants.getAppBaseUrl(ct)
+        String url = CommonUtil.getAppBaseUrl(ct)
                 + "oa/fee/updateFeePlease.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
@@ -1094,7 +1094,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
 
     public void loadDataForServer(String field, int what) {
         Log.i("leave", "what=" + what);
-        String url = Constants.getAppBaseUrl(ct) + "mobile/common/getCombo.action";
+        String url = CommonUtil.getAppBaseUrl(ct) + "mobile/common/getCombo.action";
         Map<String, String> param = new HashMap<String, String>();
         param.put("caller", "FeePlease!CCSQ");
         param.put("field", field);

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

@@ -36,7 +36,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshWebView;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
-import com.xzjmyk.pm.activity.MyApplication;
+import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.xzjmyk.pm.activity.ui.MainActivity;

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

@@ -25,7 +25,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 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.core.app.Constants;
 import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
 
 import org.apache.http.util.EncodingUtils;
@@ -230,14 +230,14 @@ public class WebViewLoadActivity extends BaseActivity {
 
     private void loadUrl(String url, String master) {
         String password = CommonUtil.getSharedPreferences(this, "user_password");
-        String urlload = Constants.getAppBaseUrl(this) + "android/jprocessDeal.action";/** @注释：调转url */
+        String urlload = CommonUtil.getAppBaseUrl(this) + "android/jprocessDeal.action";/** @注释：调转url */
         String d = null, t = null;
         if (password != null) {
             d = "" + new Date().getTime();
             Blowfish blowfish = new Blowfish("00" + d);
             t = blowfish.encryptString(password);
         }
-        String urlitem = Constants.getAppBaseUrl(this) + url;
+        String urlitem = CommonUtil.getAppBaseUrl(this) + url;
         //登录信息参数
         String postData = "t=" + t + "&d=" + d + "" + "&u=" + CommonUtil.getSharedPreferences(this, "erp_username")
                 + "&url=" + urlitem + "&master=" + master;