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

WeiChat/src/main/AndroidManifest.xml

@@ -151,7 +151,15 @@
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.LoginHistoryActivity" />
-        <activity android:name=".ui.account.DataDownloadActivity" />
+        <!---->
+        <activity android:name=".ui.account.DataDownloadActivity" >
+            <intent-filter>
+                <action android:name="com.modular.main.DataDownloadActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        
+        
         <activity android:name=".ui.account.RegisterActivity" />
         <activity android:name=".ui.account.RegisterPasswordActivity" />
         <activity android:name=".ui.account.RegisterUserBasicInfoActivity" />
@@ -235,7 +243,12 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" >
+            <intent-filter>
+                <action android:name="com.modular.main.MainActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <!-- 消息模块 -->
         <activity android:name=".ui.message.ChatActivity" />
         <activity android:name=".ui.message.NewFriendActivity" />
@@ -610,7 +623,7 @@
             android:value="57ea27bb67e58e088c003bbf" />
         <!-- weixin -->
         <activity
-            android:name=".wxapi.WXEntryActivity"
+            android:name="com.core.api.wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:screenOrientation="portrait"

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

@@ -10,10 +10,10 @@ import android.view.MenuItem;
 
 import com.andreabaccega.widget.FormEditText;
 import com.common.data.DateFormatUtil;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;

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

@@ -44,11 +44,11 @@ import com.umeng.analytics.MobclickAgent;
 import com.umeng.socialize.PlatformConfig;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 import com.core.db.DatabaseManager;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.ui.SplashActivity;
 import com.core.db.DBOpenHelper;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.core.app.MyActivityManager;
 

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

@@ -18,7 +18,7 @@ import com.common.ui.ImageUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;

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

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 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;
+import com.core.utils.helper.AvatarHelper;
 import com.common.data.ListUtils;
 
 import java.util.List;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 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;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.common.data.ListUtils;
 

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

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

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

@@ -19,7 +19,7 @@ import com.common.system.DisplayUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;

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

@@ -15,7 +15,7 @@ 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;
+import com.core.utils.helper.AvatarHelper;
 
 import java.util.List;
 

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

@@ -12,7 +12,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 
 import java.util.List;
 

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

@@ -38,9 +38,9 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
@@ -49,15 +49,15 @@ import com.xzjmyk.pm.activity.ui.circle.showCEView;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyAddActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.im.HtmlUtils;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -13,7 +13,7 @@ import com.common.data.StringUtil;
 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;
+import com.core.utils.helper.AvatarHelper;
 import com.common.data.ListUtils;
 
 import java.util.List;

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

@@ -19,11 +19,11 @@ import com.common.data.StringUtil;
 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;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.wxapi.ApiConfig;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.utils.TimeUtils;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

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

@@ -39,9 +39,9 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
@@ -54,9 +54,9 @@ import com.xzjmyk.pm.activity.util.im.HtmlUtils;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

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

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

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

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

@@ -21,7 +21,7 @@ import com.common.LogUtil;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.WorkDailyBean;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;

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

@@ -1,195 +0,0 @@
-package com.xzjmyk.pm.activity.bean;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
-public class LoginRegisterResult {
-
-	private String access_token;
-	private int expires_in;// 多少秒后过时
-	private String userId;
-	@JSONField(name = "nickname")
-	private String nickName;// 昵称
-	private int companyId;// 公司Id
-	private Login login;
-	private Cv cv;
-
-	public Cv getCv() {
-		return cv;
-	}
-
-	public void setCv(Cv cv) {
-		this.cv = cv;
-	}
-
-	public String getAccess_token() {
-		return access_token;
-	}
-
-	public void setAccess_token(String access_token) {
-		this.access_token = access_token;
-	}
-
-	public int getExpires_in() {
-		return expires_in;
-	}
-
-	public void setExpires_in(int expires_in) {
-		this.expires_in = expires_in;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getNickName() {
-		return nickName;
-	}
-
-	public void setNickName(String nickName) {
-		this.nickName = nickName;
-	}
-
-	public Login getLogin() {
-		return login;
-	}
-
-	public void setLogin(Login login) {
-		this.login = login;
-	}
-
-	public int getCompanyId() {
-		return companyId;
-	}
-
-	public void setCompanyId(int companyId) {
-		this.companyId = companyId;
-	}
-
-	public static class Cv {
-		private String resumeId;
-		private String resumeName;
-
-		public String getResumeId() {
-			return resumeId;
-		}
-
-		public void setResumeId(String resumeId) {
-			this.resumeId = resumeId;
-		}
-
-		public String getResumeName() {
-			return resumeName;
-		}
-
-		public void setResumeName(String resumeName) {
-			this.resumeName = resumeName;
-		}
-	}
-
-	public static class Login {
-		private String userId;
-		private int isFirstLogin;
-		private long loginTime;
-		private long offlineTime;
-		private String apiVersion;
-		private String model;
-		private String osVersion;
-		private String serial;
-		private String latitude;
-		private String longitude;
-		private String location;
-
-		public String getUserId() {
-			return userId;
-		}
-
-		public void setUserId(String userId) {
-			this.userId = userId;
-		}
-
-		public int getIsFirstLogin() {
-			return isFirstLogin;
-		}
-
-		public void setIsFirstLogin(int isFirstLogin) {
-			this.isFirstLogin = isFirstLogin;
-		}
-
-		public long getLoginTime() {
-			return loginTime;
-		}
-
-		public void setLoginTime(long loginTime) {
-			this.loginTime = loginTime;
-		}
-
-		public String getApiVersion() {
-			return apiVersion;
-		}
-
-		public void setApiVersion(String apiVersion) {
-			this.apiVersion = apiVersion;
-		}
-
-		public String getModel() {
-			return model;
-		}
-
-		public void setModel(String model) {
-			this.model = model;
-		}
-
-		public String getOsVersion() {
-			return osVersion;
-		}
-
-		public void setOsVersion(String osVersion) {
-			this.osVersion = osVersion;
-		}
-
-		public String getSerial() {
-			return serial;
-		}
-
-		public void setSerial(String serial) {
-			this.serial = serial;
-		}
-
-		public String getLatitude() {
-			return latitude;
-		}
-
-		public void setLatitude(String latitude) {
-			this.latitude = latitude;
-		}
-
-		public String getLongitude() {
-			return longitude;
-		}
-
-		public void setLongitude(String longitude) {
-			this.longitude = longitude;
-		}
-
-		public String getLocation() {
-			return location;
-		}
-
-		public void setLocation(String location) {
-			this.location = location;
-		}
-
-		public long getOfflineTime() {
-			return offlineTime;
-		}
-
-		public void setOfflineTime(long offlineTime) {
-			this.offlineTime = offlineTime;
-		}
-
-	}
-}

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

@@ -3,7 +3,7 @@ package com.xzjmyk.pm.activity.bean;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.PropertyPreFilter;
-import com.xzjmyk.pm.activity.volley.Result;
+import com.core.net.volley.Result;
 
 import java.util.List;
 

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

@@ -9,7 +9,7 @@ import com.j256.ormlite.dao.GenericRawResults;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -6,7 +6,7 @@ import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.DeleteBuilder;
 import com.core.model.AuthCode;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

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

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

@@ -14,7 +14,7 @@ import com.j256.ormlite.stmt.PreparedQuery;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.core.app.MyApplication;
 import com.core.model.CircleMessage;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.ArrayList;

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

@@ -25,9 +25,9 @@ import com.xzjmyk.pm.activity.bean.message.MucRoom;
 import com.xzjmyk.pm.activity.bean.message.MucRoomMember;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
-import com.xzjmyk.pm.activity.sp.TableVersionSp;
+import com.core.utils.sp.TableVersionSp;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
 

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

@@ -11,9 +11,9 @@ 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;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.utils.TimeUtils;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -15,9 +15,9 @@ 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;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.utils.TimeUtils;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -8,7 +8,7 @@ import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.DeleteBuilder;
 import com.core.app.MyApplication;
 import com.core.model.MyPhoto;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -9,7 +9,7 @@ import com.j256.ormlite.stmt.PreparedQuery;
 import com.j256.ormlite.stmt.UpdateBuilder;
 import com.core.model.NewFriendMessage;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -5,7 +5,7 @@ import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.bean.TableConstant;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -12,7 +12,7 @@ import com.j256.ormlite.stmt.UpdateBuilder;
 import com.core.app.MyApplication;
 import com.core.model.Company;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 
 import java.sql.SQLException;
 

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

@@ -5,7 +5,7 @@ import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.core.model.VideoFile;
-import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.core.db.SQLiteHelper;
 import com.core.app.MyApplication;
 
 import java.sql.SQLException;

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

@@ -9,7 +9,7 @@ import com.common.data.StringUtil;
 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;
+import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/sp/LocationSp.java

@@ -1,89 +0,0 @@
-package com.xzjmyk.pm.activity.sp;
-
-import android.content.Context;
-
-/**
- * 不区分用户，因为即使切换用户，最后一次更新书剑的数据有一些错误也没关系 更新时间都是秒级别的，不是毫秒级别的
- * 
- * 
- */
-
-/**
- * 通过Sharepreference来保存用户定位信息
- */
-public class LocationSp extends CommonSp {
-	private static final String SP_NAME = "location_info";// FILE_NAME
-	private static LocationSp instance;
-
-	/* known key */
-	public static final String KEY_LONGITUDE = "longitude";// 经度
-	public static final String KEY_LATITUDE = "latitude";// 纬度
-	public static final String KEY_ADDRESS = "address";// 地址
-	public static final String KEY_PROVINCE_NAME = "province_name";// 省份
-	public static final String KEY_CITY_NAME = "city_name";// 城市名字
-	public static final String KEY_DISTRICT_NAME = "district_name";// 区/县
-
-	public static final LocationSp getInstance(Context context) {
-		if (instance == null) {
-			synchronized (LocationSp.class) {
-				if (instance == null) {
-					instance = new LocationSp(context);
-				}
-			}
-		}
-		return instance;
-	}
-
-	private LocationSp(Context context) {
-		super(context, SP_NAME);
-	}
-
-	public void setLongitude(float value) {
-		setValue(KEY_LONGITUDE, value);
-	}
-
-	public float getLongitude(float defaultValue) {
-		return getValue(KEY_LONGITUDE, defaultValue);
-	}
-
-	public void setLatitude(float value) {
-		setValue(KEY_LATITUDE, value);
-	}
-
-	public float getLatitude(float defaultValue) {
-		return getValue(KEY_LATITUDE, defaultValue);
-	}
-
-	public void setAddress(String value) {
-		setValue(KEY_ADDRESS, value);
-	}
-
-	public String getAddress(String defaultValue) {
-		return getValue(KEY_ADDRESS, defaultValue);
-	}
-
-	public void setProvinceName(String value) {
-		setValue(KEY_PROVINCE_NAME, value);
-	}
-
-	public String getProvinceName(String defaultValue) {
-		return getValue(KEY_PROVINCE_NAME, defaultValue);
-	}
-
-	public void setCityName(String value) {
-		setValue(KEY_CITY_NAME, value);
-	}
-
-	public String getCityName(String defaultValue) {
-		return getValue(KEY_CITY_NAME, defaultValue);
-	}
-
-	public void setDistrictName(String value) {
-		setValue(KEY_DISTRICT_NAME, value);
-	}
-
-	public String getDistrictName(String defaultValue) {
-		return getValue(KEY_DISTRICT_NAME, defaultValue);
-	}
-
-}

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

@@ -42,52 +42,53 @@ import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
-import com.core.net.NetWorkObservable;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.User;
+import com.core.base.BaseActivity;
+import com.core.dao.UserDao;
 import com.core.model.CircleMessage;
 import com.core.model.NewFriendMessage;
+import com.core.model.User;
+import com.core.net.NetWorkObservable;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.FastVolley;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.utils.helper.LoginHelper;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
-import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.contact.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.BadgeUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
+import com.xzjmyk.pm.activity.util.IntentUtils;
 import com.xzjmyk.pm.activity.util.dialog.QSearchPpwindowUtils;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.util.oa.AutoErpService;
+import com.xzjmyk.pm.activity.util.oa.BadgeUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-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;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
@@ -103,17 +104,6 @@ import java.util.Map;
 import static android.view.View.GONE;
 
 
-/**
- * @项目名称: SkWeiChat-Baidu
- * @包名: com.xzjmyk.pm.activity.ui
- * @作者:王阳
- * @创建时间: 2015年10月16日 下午3:14:20
- * @描述: Fragment所寄宿的Activity
- * @SVN版本号: $Rev$
- * @修改人: $Author$
- * @修改时间: $Date$
- * @修改的内容: TODO
- */
 public class MainActivity extends BaseActivity implements NetWorkObservable.NetWorkObserver, AuthStateListener {
     private static final int LOG_SEND_REQUEST = 17519;
     public static String HASHCODE = "MainActivity";
@@ -647,7 +637,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     startActivity(intent);
                 } catch (Exception e) {
-                    ViewUtil.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "UU互联");
+                    IntentUtils.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "UU互联");
                 }
                 popupWindow.dismiss();
             }

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

@@ -13,7 +13,7 @@ import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.apache.http.Header;

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

@@ -20,19 +20,19 @@ import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.ConfigBean;
-import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
+import com.core.model.LoginRegisterResult;
 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;
+import com.core.dao.UserDao;
+import com.core.utils.helper.LoginHelper;
+import com.core.utils.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ADActivity;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.utils.TimeUtils;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
 

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

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

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

@@ -28,25 +28,25 @@ import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
-import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.sp.UserSp;
+import com.core.dao.UserDao;
+import com.core.utils.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

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

@@ -21,23 +21,19 @@ import com.common.preferences.PreferenceUtils;
 import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
-
 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.core.base.BaseActivity;
+import com.core.model.LoginRegisterResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
-
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+import com.xzjmyk.pm.activity.R;
+import com.core.net.http.ViewUtil;
+import com.xzjmyk.pm.activity.util.IntentUtils;
 
 import java.util.HashMap;
 
@@ -95,7 +91,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
             if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                //TODO 没有获取到权限
                 LogUtil.i("没有获取到权限");
             } else {
                 LogUtil.i("已经用户赋予权限获取到权限");
@@ -138,7 +133,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
               startActivity(new Intent(mContext,RegisterSelectActivity.class));
                 break;
             case R.id.tv_findPwd:
-                ViewUtil.webLinks(mContext,
+                IntentUtils.webLinks(mContext,
                         "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
                         getString(R.string.login_getpwd));
                 break;
@@ -146,7 +141,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void login() {
-   
         final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
         final String password = mPasswordEdit.getText().toString().trim();
         PreferenceUtils.putString(this, PASS_WORDS, password);
@@ -206,19 +200,9 @@ 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);//登录管理平台
-                    
-                    String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
-                    String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_In);
-
-                    if (!TextUtils.isEmpty(saved_time)) {
-                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In, saved_time + "," + nowtime);
-                    } else {
-                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In, nowtime);
-                    }
-                } else {// 登录失败
+                if (success) {
+                    login_manage(phoneNumber, password);
+                } else {
                     String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
                     ToastUtil.showToast(mContext, message);
                 }
@@ -230,10 +214,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
 
-    /**
-     * @desc:登录管理平台
-     * @author：Administrator on 2016/2/18 10:53
-     */
+
     private void login_manage(String phone, String password) {
         if (TextUtils.isEmpty(phone)) {
             return;

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

@@ -21,19 +21,19 @@ 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.core.model.LoginRegisterResult;
+import com.core.model.LoginRegisterResult.Login;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.db.dao.UserDao;
-import com.xzjmyk.pm.activity.sp.UserSp;
+import com.core.dao.UserDao;
+import com.core.utils.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.core.utils.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;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
 

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

@@ -20,10 +20,10 @@ import com.common.ui.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.AuthCode;
 import com.xzjmyk.pm.activity.db.dao.AuthCodeDao;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -5,12 +5,12 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import com.core.base.BaseActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.PersonalRegActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.util.IntentUtils;
 
 public class RegisterSelectActivity extends BaseActivity {
     @ViewInject(R.id.person_btn)
@@ -35,7 +35,7 @@ public class RegisterSelectActivity extends BaseActivity {
         company_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ViewUtil.webLinks(mContext,
+                IntentUtils.webLinks(mContext,
                         "https://account.ubtob.com/sso/register",
                         "企业注册");
             }

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

@@ -32,16 +32,16 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 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.core.model.LoginRegisterResult;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.utils.helper.LoginHelper;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import org.apache.http.Header;
 

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

@@ -19,7 +19,7 @@ import com.common.LogUtil;
 import com.common.preferences.PreferenceUtils;
 import com.umeng.analytics.MobclickAgent;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.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;

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

@@ -39,9 +39,9 @@ import com.xzjmyk.pm.activity.sortlist.SideBar;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -16,7 +16,7 @@ import android.widget.RadioButton;
 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;
+import com.core.base.BaseActivity;
 
 /**
  * 我的名片盒

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

@@ -45,11 +45,11 @@ import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -33,9 +33,9 @@ import com.xzjmyk.pm.activity.sortlist.SideBar;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -57,12 +57,12 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
 import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
@@ -70,11 +70,11 @@ import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.NewFriendListener;

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

@@ -50,18 +50,18 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.core.utils.ToastUtil;
 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.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.io.File;
 import java.io.FileNotFoundException;

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

@@ -32,15 +32,15 @@ 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;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 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.core.net.volley.ArrayResult;
+import com.core.net.volley.StringJsonArrayRequest;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
@@ -48,9 +48,9 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.OnCompleteListener;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -31,22 +31,22 @@ import com.core.model.User;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.utils.helper.AvatarHelper;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgDetailHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgImageHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgTypeView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgVideoHeaderView;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.CommentBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -49,9 +49,9 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
@@ -59,11 +59,11 @@ import com.common.data.ListUtils;
 import com.core.utils.ToastUtil;
 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.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.io.File;
 import java.io.FileNotFoundException;

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

@@ -25,14 +25,14 @@ 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;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -39,17 +39,17 @@ 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;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 import com.xzjmyk.pm.pictureselector.ComPictureAdapter;
 import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 

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

@@ -36,17 +36,17 @@ 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;
-import com.xzjmyk.pm.activity.util.im.helper.LoginHelper;
+import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.imageloader.BitmapUtil;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -55,19 +55,19 @@ import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.NewFriendListener;

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

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

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

@@ -28,9 +28,9 @@ 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.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;

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

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

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

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

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

@@ -61,8 +61,8 @@ import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.common.thread.ThreadPool;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.yalantis.phoenix.PullToRefreshView;
 
 import java.util.ArrayList;

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

@@ -38,7 +38,7 @@ import com.xzjmyk.pm.activity.sortlist.BaseComparator;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.xzjmyk.pm.activity.sortlist.SideBar;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
@@ -50,9 +50,9 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.util.oa.http.Request;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -18,12 +18,12 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.UserAdapter;
 import com.core.model.User;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -18,7 +18,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 
 
 /**

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

@@ -40,8 +40,8 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest.HttpMethod;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.util.im.RecordUtil;

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

@@ -16,7 +16,7 @@ import android.widget.TextView;
 
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Approve;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.R;

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

@@ -36,10 +36,10 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 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.ui.base.BaseActivity;
+import com.core.dao.UserDao;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSexActivity;
@@ -51,12 +51,12 @@ import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.me.BasicInfoEditActivity;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
 
 import org.apache.http.Header;
 

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

@@ -38,25 +38,25 @@ 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.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -7,7 +7,7 @@ import android.widget.FrameLayout;
 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.core.base.BaseActivity;
 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/CompanyActivity.java

@@ -17,7 +17,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 

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

@@ -42,15 +42,15 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
+import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ListUtils;
@@ -382,8 +382,8 @@ public class CompanyContactsActivity extends BaseActivity  {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     String exception = msg.getData().getString("result");
-                    com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ToastMessage(ct, exception);
-                    com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.AutoLoginErp(ct);
+                    com.core.net.http.ViewUtil.ToastMessage(ct, exception);
+                    com.core.net.http.ViewUtil.AutoLoginErp(ct);
 //                    reScrollView.onRefreshComplete();
 
                     if (reScrollView.isRefreshing()) {

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

@@ -3,7 +3,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity;
 import android.os.Bundle;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 
 /**
  * Created by RaoMeng on 2017/8/3.

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

@@ -6,7 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 
 /**

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

@@ -22,20 +22,19 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
+import com.core.utils.FlexJsonUtil;
+import com.core.utils.helper.AvatarHelper;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.im.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-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;
 
 import java.util.ArrayList;

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

@@ -33,12 +33,12 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 

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

@@ -32,13 +32,13 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -14,7 +14,7 @@ import android.widget.TextView;
 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.core.base.BaseActivity;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -19,12 +19,12 @@ import com.common.data.StringUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraLeaveEntity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;

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

@@ -22,14 +22,14 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.apache.http.client.ClientProtocolException;

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

@@ -32,14 +32,15 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveEntity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
+
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
@@ -47,8 +48,8 @@ import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
 import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.xzjmyk.pm.activity.wxapi.ApiConfig;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -19,7 +19,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 
 /**
  * @author :LiuJie 2015年6月17日 下午5:23:22

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

@@ -7,7 +7,7 @@ import android.widget.ListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
 import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.AllRemovedSubsAdapter;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -16,8 +16,8 @@ import com.common.data.StringUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 

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

@@ -28,9 +28,9 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ObjectUtils;

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

@@ -12,7 +12,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
 
 import java.util.ArrayList;

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

@@ -24,9 +24,9 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.common.data.ObjectUtils;

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

@@ -30,22 +30,22 @@ 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;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveUpdateEntity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.xzjmyk.pm.activity.wxapi.ApiConfig;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -14,7 +14,7 @@ import android.widget.TextView;
 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.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.ChartListFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.QueryGridFragment;
 import com.xzjmyk.pm.activity.ui.erp.model.ImageInfo;

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

@@ -41,12 +41,12 @@ import com.github.mikephil.charting.utils.PercentFormatter;
 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.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewAdapter;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;

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

@@ -23,16 +23,16 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Approve;
 import com.xzjmyk.pm.activity.ui.erp.model.DetailColumns;
 import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.PanelItems;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.PickDialog;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.io.Serializable;

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

@@ -53,12 +53,12 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.json.JSONArray;

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

@@ -23,14 +23,14 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import java.util.ArrayList;

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

@@ -9,7 +9,7 @@ import android.view.MenuItem;
 import com.viewpagerindicator.TabPageIndicator;
 import com.viewpagerindicator.UnderlinePageIndicator;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SubscribeManegeVpAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.BaseFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionAllFragment;

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

@@ -37,8 +37,8 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 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.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

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

@@ -38,15 +38,15 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;

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

@@ -34,7 +34,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 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;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelAddEntity;
@@ -43,20 +43,20 @@ import com.xzjmyk.pm.activity.ui.erp.model.TravelEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelItems;
 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.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.json.FlexJsonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.TravelPageActivity;
-import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.xzjmyk.pm.activity.wxapi.ApiConfig;
-import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -5,7 +5,7 @@ import android.os.PersistableBundle;
 import android.support.v4.app.FragmentTransaction;
 
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.UUFriendFragment;
 
 /**

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

@@ -41,8 +41,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.apache.http.cookie.Cookie;