更新包名后 4-28

WeiChat/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        applicationId "com.sk.weichat"
+        applicationId "com.xzjmyk.pm.activity"
         minSdkVersion 14
         targetSdkVersion 22
         compileOptions {

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sk.weichat"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    package="com.xzjmyk.pm.activity"
+    android:versionCode="33"
+    android:versionName="3.3" >
 
     <uses-sdk
         android:minSdkVersion="14"

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

@@ -34,8 +34,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.sk.weichat.R;
-
+import com.xzjmyk.pm.activity.R;
 import java.io.File;
 
 /**

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

@@ -12,7 +12,7 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 import java.io.File;
 import java.io.FileInputStream;

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

@@ -23,7 +23,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -25,7 +25,8 @@ import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.ListView;
 
-import com.sk.weichat.R;
+
+import com.xzjmyk.pm.activity.R;
 
 import java.io.File;
 import java.util.List;

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

@@ -14,11 +14,11 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.sk.weichat.R;
-import com.sk.weichat.bean.message.ChatMessage;
-import com.sk.weichat.ui.base.ActionBackActivity;
-import com.sk.weichat.ui.message.InstantMessageActivity;
-import com.sk.weichat.util.Constants;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.message.InstantMessageActivity;
+import com.xzjmyk.pm.activity.util.Constants;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -17,7 +17,7 @@ import android.provider.DocumentsProvider;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 import java.io.File;
 import java.io.FileNotFoundException;

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

@@ -9,7 +9,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 public class SelectFileWindow extends PopupWindow {
     private Button  mInstant, mCancle, mDelete,mInfo;

WeiChat/src/main/java/com/roamer/slidelistview/SlideListView.java

@@ -13,7 +13,7 @@ import android.widget.AdapterView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 import java.lang.reflect.Field;
 

WeiChat/src/main/java/com/roamer/slidelistview/wrap/SlideItemWrapLayout.java

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
 import com.roamer.slidelistview.SlideListView.SlideAction;
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 /**
  * wrap the listview item,It may have three directly sub view(front view ,left

WeiChat/src/main/java/com/sk/weichat/AppConfig.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConfig.java

@@ -1,11 +1,11 @@
-package com.sk.weichat;
+package com.xzjmyk.pm.activity;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.text.TextUtils;
 import android.util.Log;
-import com.sk.weichat.bean.ConfigBean;
+import com.xzjmyk.pm.activity.bean.ConfigBean;
 
 public class AppConfig {
 	public static final String TAG = "roamer";

WeiChat/src/main/java/com/sk/weichat/AppConstant.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConstant.java

@@ -1,4 +1,4 @@
-package com.sk.weichat;
+package com.xzjmyk.pm.activity;
 
 public class AppConstant {
 	/** 某些地方选择数据使用的常量 */

WeiChat/src/main/java/com/sk/weichat/BdLocationHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -1,4 +1,4 @@
-package com.sk.weichat;
+package com.xzjmyk.pm.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,7 +9,7 @@ import com.baidu.location.BDLocationListener;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
 import com.baidu.location.LocationClientOption.LocationMode;
-import com.sk.weichat.sp.LocationSp;
+import com.xzjmyk.pm.activity.sp.LocationSp;
 
 public class BdLocationHelper {
 	public static final String ACTION_LOCATION_UPDATE = AppConfig.sPackageName + ".action.location_update";

WeiChat/src/main/java/com/sk/weichat/MyApplication.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -1,4 +1,4 @@
-package com.sk.weichat;
+package com.xzjmyk.pm.activity;
 
 import android.app.Application;
 import android.graphics.Bitmap;
@@ -20,13 +20,12 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
-import com.sk.weichat.NetWorkObservable.NetWorkObserver;
-import com.sk.weichat.bean.ConfigBean;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.db.SQLiteHelper;
-import com.sk.weichat.util.Constants;
-import com.sk.weichat.util.PreferenceUtils;
-import com.sk.weichat.volley.FastVolley;
+import com.xzjmyk.pm.activity.bean.ConfigBean;
+import com.xzjmyk.pm.activity.bean.User;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.volley.FastVolley;
 
 import org.apache.http.cookie.Cookie;
 
@@ -64,7 +63,7 @@ public class MyApplication extends Application {
 				// 初始化图片加载
 				initImageLoader();
 			}
-		},1);
+		}, 1);
 		if (AppConfig.DEBUG) {
 			Log.d(AppConfig.TAG, "MyApplication onCreate");
 		}
@@ -120,13 +119,13 @@ public class MyApplication extends Application {
 		return true;
 	}
 
-	public void registerNetWorkObserver(NetWorkObserver observer) {
+	public void registerNetWorkObserver(NetWorkObservable.NetWorkObserver observer) {
 		if (mNetWorkObservable != null) {
 			mNetWorkObservable.registerObserver(observer);
 		}
 	}
 
-	public void unregisterNetWorkObserver(NetWorkObserver observer) {
+	public void unregisterNetWorkObserver(NetWorkObservable.NetWorkObserver observer) {
 		if (mNetWorkObservable != null) {
 			mNetWorkObservable.unregisterObserver(observer);
 		}
@@ -195,16 +194,16 @@ public class MyApplication extends Application {
 		}
 
 		mNormalImageOptions = new DisplayImageOptions.Builder().bitmapConfig(Config.RGB_565).cacheInMemory(true).cacheOnDisc(true)
-				.resetViewBeforeLoading(false).showImageForEmptyUri(R.drawable.image_download_fail_icon)
-				.showImageOnFail(R.drawable.image_download_fail_icon).build();
+				.resetViewBeforeLoading(false).showImageForEmptyUri(com.xzjmyk.pm.activity.R.drawable.image_download_fail_icon)
+				.showImageOnFail(com.xzjmyk.pm.activity.R.drawable.image_download_fail_icon).build();
 
 		mAvatarRoundImageOptions = new DisplayImageOptions.Builder().bitmapConfig(Config.RGB_565).cacheInMemory(true).cacheOnDisc(true)
-				.displayer(new RoundedBitmapDisplayer(10)).resetViewBeforeLoading(true).showImageForEmptyUri(R.drawable.avatar_normal)
-				.showImageOnFail(R.drawable.avatar_normal).showImageOnLoading(R.drawable.avatar_normal).build();
+				.displayer(new RoundedBitmapDisplayer(10)).resetViewBeforeLoading(true).showImageForEmptyUri(com.xzjmyk.pm.activity.R.drawable.avatar_normal)
+				.showImageOnFail(com.xzjmyk.pm.activity.R.drawable.avatar_normal).showImageOnLoading(com.xzjmyk.pm.activity.R.drawable.avatar_normal).build();
 
 		mAvatarNormalImageOptions = new DisplayImageOptions.Builder().bitmapConfig(Config.RGB_565).cacheInMemory(true).cacheOnDisc(true)
-				.resetViewBeforeLoading(true).showImageForEmptyUri(R.drawable.avatar_normal).showImageOnFail(R.drawable.avatar_normal)
-				.showImageOnLoading(R.drawable.avatar_normal).build();
+				.resetViewBeforeLoading(true).showImageForEmptyUri(com.xzjmyk.pm.activity.R.drawable.avatar_normal).showImageOnFail(com.xzjmyk.pm.activity.R.drawable.avatar_normal)
+				.showImageOnLoading(com.xzjmyk.pm.activity.R.drawable.avatar_normal).build();
 
 		ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).defaultDisplayImageOptions(mNormalImageOptions)
 				// .denyCacheImageMultipleSizesInMemory()

WeiChat/src/main/java/com/sk/weichat/NetWorkObservable.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/NetWorkObservable.java

@@ -1,4 +1,4 @@
-package com.sk.weichat;
+package com.xzjmyk.pm.activity;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -9,7 +9,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.util.Log;
 
-import com.sk.weichat.NetWorkObservable.NetWorkObserver;
+import com.xzjmyk.pm.activity.NetWorkObservable.NetWorkObserver;
 
 public class NetWorkObservable extends Observable<NetWorkObserver> {
 	public static interface NetWorkObserver {

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.adapter;
+package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -10,11 +10,11 @@ import android.widget.ImageView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 
-import com.sk.weichat.R;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.helper.AvatarHelper;
-import com.sk.weichat.sortlist.BaseSortModel;
-import com.sk.weichat.util.ViewHolder;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.util.ViewHolder;
 
 import java.util.HashMap;
 import java.util.List;

WeiChat/src/main/java/com/sk/weichat/adapter/ImagesInnerGridViewAdapter.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/ImagesInnerGridViewAdapter.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.adapter;
+package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -7,8 +7,8 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView.ScaleType;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.sk.weichat.bean.circle.PublicMessage.Resource;
-import com.sk.weichat.view.SquareCenterImageView;
+import com.xzjmyk.pm.activity.view.SquareCenterImageView;
+import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.adapter;
+package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,13 +9,13 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.sk.weichat.R;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.message.NewFriendMessage;
-import com.sk.weichat.bean.message.XmppMessage;
-import com.sk.weichat.db.dao.FriendDao;
-import com.sk.weichat.helper.AvatarHelper;
-import com.sk.weichat.util.ViewHolder;
+import com.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.xzjmyk.pm.activity.bean.message.XmppMessage;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.util.ViewHolder;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.adapter;
+package com.xzjmyk.pm.activity.adapter;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -23,41 +23,40 @@ import android.widget.TextView;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.sk.weichat.AppConstant;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.R;
-import com.sk.weichat.audio.AudioPalyer;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.circle.Comment;
-import com.sk.weichat.bean.circle.Praise;
-import com.sk.weichat.bean.circle.PublicMessage;
-import com.sk.weichat.bean.circle.PublicMessage.Body;
-import com.sk.weichat.bean.circle.PublicMessage.Resource;
-import com.sk.weichat.db.dao.CircleMessageDao;
-import com.sk.weichat.db.dao.FriendDao;
-import com.sk.weichat.helper.AvatarHelper;
-import com.sk.weichat.ui.MainActivity;
-import com.sk.weichat.ui.base.BaseActivity;
-import com.sk.weichat.ui.circle.BusinessCircleActivity;
-import com.sk.weichat.ui.circle.BusinessCircleActivity.ListenerAudio;
-import com.sk.weichat.ui.circle.BusinessCircleFragment;
-import com.sk.weichat.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
-import com.sk.weichat.ui.circle.PMsgDetailActivity;
-import com.sk.weichat.ui.circle.showCEView;
-import com.sk.weichat.ui.tool.MultiImagePreviewActivity;
-import com.sk.weichat.ui.tool.SingleImagePreviewActivity;
-import com.sk.weichat.util.HtmlUtils;
-import com.sk.weichat.util.LinkMovementClickMethod;
-import com.sk.weichat.util.ProgressDialogUtil;
-import com.sk.weichat.util.StringUtils;
-import com.sk.weichat.util.SystemUtil;
-import com.sk.weichat.util.TimeUtils;
-import com.sk.weichat.util.ToastUtil;
-import com.sk.weichat.view.MyGridView;
-import com.sk.weichat.view.OperationMorePopWindow;
-import com.sk.weichat.volley.ObjectResult;
-import com.sk.weichat.volley.Result;
-import com.sk.weichat.volley.StringJsonObjectRequest;
+import com.xzjmyk.pm.activity.AppConstant;
+import com.xzjmyk.pm.activity.audio.AudioPalyer;
+import com.xzjmyk.pm.activity.bean.circle.Praise;
+import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
+import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.HtmlUtils;
+import com.xzjmyk.pm.activity.util.LinkMovementClickMethod;
+import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
+import com.xzjmyk.pm.activity.util.StringUtils;
+import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.MyGridView;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.bean.circle.Comment;
+import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
+import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
+import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
+import com.xzjmyk.pm.activity.ui.circle.showCEView;
+import com.xzjmyk.pm.activity.util.SystemUtil;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+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 java.util.ArrayList;
 import java.util.HashMap;
@@ -75,7 +74,7 @@ import java.util.Map;
  * @修改时间: $Date$
  * @修改的内容: 增加一个接口在界面不可见时让音频停止
  */
-public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio, ListenerAudioFragment {
+public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleActivity.ListenerAudio, ListenerAudioFragment {
 
     private Context mContext;
     private List<PublicMessage> mMessages;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.adapter;
+package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,11 +10,11 @@ import android.widget.TextView;
 
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.R;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.helper.AvatarHelper;
-import com.sk.weichat.util.ViewHolder;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.User;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.util.ViewHolder;
 
 import java.text.DecimalFormat;
 import java.util.List;

WeiChat/src/main/java/com/sk/weichat/adapter/UserClickableSpan.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/UserClickableSpan.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.adapter;
+package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,9 +9,9 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 
-import com.sk.weichat.AppConstant;
-import com.sk.weichat.R;
-import com.sk.weichat.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.AppConstant;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.R;
 
 public class UserClickableSpan extends ClickableSpan {
 

WeiChat/src/main/java/com/sk/weichat/audio/AudioPalyer.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/AudioPalyer.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.media.AudioManager;
 import android.media.MediaPlayer;

WeiChat/src/main/java/com/sk/weichat/audio/IMRecordController.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/IMRecordController.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.content.Context;
 import android.util.Log;

WeiChat/src/main/java/com/sk/weichat/audio/RecordController.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/RecordController.java

@@ -1,11 +1,11 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.content.Context;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;
 
-import com.sk.im.audio.MP3Recorder;
+import com.xzjmyk.pm.im.audio.MP3Recorder;
 
 public class RecordController implements View.OnTouchListener,RecordStateListener {
 	private final int UP_MOVE_CHECK_NUM = 80;

WeiChat/src/main/java/com/sk/weichat/audio/RecordListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/RecordListener.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 public interface RecordListener {
 	public void onRecordStart();

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.media.MediaRecorder;
 import android.media.MediaRecorder.AudioSource;
@@ -7,7 +7,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 
-import com.sk.weichat.util.FileUtil;
+import com.xzjmyk.pm.activity.util.FileUtil;
 
 import java.io.File;
 import java.util.Timer;

WeiChat/src/main/java/com/sk/weichat/audio/RecordPopWindow.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/RecordPopWindow.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,7 +10,7 @@ import android.widget.LinearLayout.LayoutParams;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import com.sk.weichat.R;
+import com.xzjmyk.pm.activity.R;
 
 public class RecordPopWindow {
 	private Context mContext;

WeiChat/src/main/java/com/sk/weichat/audio/RecordStateListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/RecordStateListener.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 public interface RecordStateListener {
 	public void onRecordStarting();//

WeiChat/src/main/java/com/sk/weichat/audio/VoiceHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/VoiceHelper.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.media.MediaPlayer;
 

WeiChat/src/main/java/com/sk/weichat/audio/VoicePlayer.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/VoicePlayer.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.audio;
+package com.xzjmyk.pm.activity.audio;
 
 import android.media.MediaPlayer;
 import android.os.Handler;

WeiChat/src/main/java/com/sk/weichat/bean/AddAttentionResult.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/AddAttentionResult.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 public class AddAttentionResult {
 

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

@@ -1,11 +1,11 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import android.text.TextUtils;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.db.dao.AreasDao;
+import com.xzjmyk.pm.activity.db.dao.AreasDao;
+import com.xzjmyk.pm.activity.MyApplication;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/sk/weichat/bean/AttentionUser.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/AttentionUser.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

WeiChat/src/main/java/com/sk/weichat/bean/AuthCode.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/AuthCode.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;

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

@@ -1,8 +1,8 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.util.StringUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.io.Serializable;
 

WeiChat/src/main/java/com/sk/weichat/bean/ConfigBean.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/ConfigBean.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 public class ConfigBean {
 

WeiChat/src/main/java/com/sk/weichat/bean/Friend.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/Friend.java

@@ -1,12 +1,12 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.db.dao.FriendDao;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
 
 import java.io.Serializable;
 

WeiChat/src/main/java/com/sk/weichat/bean/LoginAuto.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/LoginAuto.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 /**
  * 检查Token是否过期的Bean
  *

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

WeiChat/src/main/java/com/sk/weichat/bean/MucRoomSimple.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/MucRoomSimple.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 public class MucRoomSimple {
 

WeiChat/src/main/java/com/sk/weichat/bean/MyPhoto.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/MyPhoto.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.j256.ormlite.field.DatabaseField;

WeiChat/src/main/java/com/sk/weichat/bean/TableConstant.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/TableConstant.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,9 +8,9 @@ import android.util.SparseIntArray;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.db.dao.TableConstantDao;
-import com.sk.weichat.ui.tool.SelectConstantActivity;
-import com.sk.weichat.ui.tool.SelectConstantSectionActivity;
+import com.xzjmyk.pm.activity.db.dao.TableConstantDao;
+import com.xzjmyk.pm.activity.ui.tool.SelectConstantActivity;
+import com.xzjmyk.pm.activity.ui.tool.SelectConstantSectionActivity;
 
 @DatabaseTable(tableName = "tb_constants")
 public class TableConstant {

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

@@ -1,9 +1,9 @@
-package com.sk.weichat.bean;
+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.sk.weichat.volley.Result;
+import com.xzjmyk.pm.activity.volley.Result;
 
 import java.util.List;
 

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

@@ -1,9 +1,9 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.util.StringUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.io.Serializable;
 

WeiChat/src/main/java/com/sk/weichat/bean/VideoFile.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/VideoFile.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean;
+package com.xzjmyk.pm.activity.bean;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;

WeiChat/src/main/java/com/sk/weichat/bean/circle/CircleMessage.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/circle/CircleMessage.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.circle;
+package com.xzjmyk.pm.activity.bean.circle;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;

WeiChat/src/main/java/com/sk/weichat/bean/circle/Comment.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/circle/Comment.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.circle;
+package com.xzjmyk.pm.activity.bean.circle;
 
 import android.text.TextUtils;
 

WeiChat/src/main/java/com/sk/weichat/bean/circle/Gift.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/circle/Gift.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.circle;
+package com.xzjmyk.pm.activity.bean.circle;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

WeiChat/src/main/java/com/sk/weichat/bean/circle/Praise.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/circle/Praise.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.circle;
+package com.xzjmyk.pm.activity.bean.circle;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

WeiChat/src/main/java/com/sk/weichat/bean/circle/PublicMessage.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/circle/PublicMessage.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.circle;
+package com.xzjmyk.pm.activity.bean.circle;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.message;
+package com.xzjmyk.pm.activity.bean.message;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -8,8 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.db.dao.ChatMessageDao;
-import com.sk.weichat.db.dao.ChatMessageDaoImpl;
+import com.xzjmyk.pm.activity.db.dao.ChatMessageDaoImpl;
 
 /**
  * @项目名称: SkWeiChat-Baidu

WeiChat/src/main/java/com/sk/weichat/bean/message/MucRoom.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/MucRoom.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.message;
+package com.xzjmyk.pm.activity.bean.message;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

WeiChat/src/main/java/com/sk/weichat/bean/message/MucRoomMember.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/MucRoomMember.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.message;
+package com.xzjmyk.pm.activity.bean.message;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.message;
+package com.xzjmyk.pm.activity.bean.message;
 
 import android.text.TextUtils;
 
@@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.util.TimeUtils;
+import com.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.bean.User;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.io.Serializable;
 import java.util.UUID;

WeiChat/src/main/java/com/sk/weichat/bean/message/XmppMessage.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/XmppMessage.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.bean.message;
+package com.xzjmyk.pm.activity.bean.message;
 
 import com.alibaba.fastjson.JSONObject;
 import com.j256.ormlite.field.DatabaseField;

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

@@ -1,10 +1,10 @@
-package com.sk.weichat.broadcast;
+package com.xzjmyk.pm.activity.broadcast;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.sk.weichat.AppConfig;
+import com.xzjmyk.pm.activity.AppConfig;
 
 /**
  * 名片盒的Ui更新

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

@@ -1,9 +1,9 @@
-package com.sk.weichat.broadcast;
+package com.xzjmyk.pm.activity.broadcast;
 
 import android.content.Context;
 import android.content.Intent;
 
-import com.sk.weichat.AppConfig;
+import com.xzjmyk.pm.activity.AppConfig;
 
 /**
  * 用于聊天消息的广播，更新MainActivity Tab栏显示的未读数量 和 消息界面数据的更新

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

@@ -1,10 +1,10 @@
-package com.sk.weichat.broadcast;
+package com.xzjmyk.pm.activity.broadcast;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.sk.weichat.AppConfig;
+import com.xzjmyk.pm.activity.AppConfig;
 
 /**
  * 群聊UI的更新

WeiChat/src/main/java/com/sk/weichat/broadcast/ScrenLockedBroadCastReceiver.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/ScrenLockedBroadCastReceiver.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.broadcast;
+package com.xzjmyk.pm.activity.broadcast;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db;
+package com.xzjmyk.pm.activity.db;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
@@ -6,15 +6,16 @@ import android.database.sqlite.SQLiteDatabase;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
-import com.sk.weichat.R;
-import com.sk.weichat.bean.AuthCode;
-import com.sk.weichat.bean.Company;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.MyPhoto;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.bean.VideoFile;
-import com.sk.weichat.bean.circle.CircleMessage;
-import com.sk.weichat.bean.message.NewFriendMessage;
+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.MyPhoto;
+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.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.bean.User;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -22,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
 
+
 public class SQLiteHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "shiku.db";
 	private static final int DATABASE_VERSION = 2;

WeiChat/src/main/java/com/sk/weichat/db/SQLiteRawUtil.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/db/SQLiteRawUtil.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.db;
+package com.xzjmyk.pm.activity.db;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

WeiChat/src/main/java/com/sk/weichat/db/UnlimitDaoManager.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/db/UnlimitDaoManager.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.db;
+package com.xzjmyk.pm.activity.db;
 
 import com.j256.ormlite.dao.BaseDaoImpl;
 import com.j256.ormlite.dao.Dao;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import android.text.TextUtils;
 
@@ -7,9 +7,9 @@ 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.sk.weichat.MyApplication;
-import com.sk.weichat.bean.Area;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.Area;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -1,12 +1,12 @@
-package com.sk.weichat.db.dao;
+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.j256.ormlite.stmt.DeleteBuilder;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.AuthCode;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.bean.AuthCode;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import android.text.TextUtils;
 import android.util.Log;
@@ -9,13 +9,13 @@ import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.stmt.UpdateBuilder;
 import com.j256.ormlite.table.DatabaseTableConfig;
-import com.sk.weichat.BuildConfig;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.message.ChatMessage;
-import com.sk.weichat.db.SQLiteHelper;
-import com.sk.weichat.db.SQLiteRawUtil;
-import com.sk.weichat.db.UnlimitDaoManager;
-import com.sk.weichat.util.TimeUtils;
+import com.xzjmyk.pm.activity.BuildConfig;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
+import com.xzjmyk.pm.activity.db.UnlimitDaoManager;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.sql.SQLException;
 import java.util.ArrayList;

WeiChat/src/main/java/com/sk/weichat/db/dao/ChatMessageDaoImpl.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/ChatMessageDaoImpl.java

@@ -1,9 +1,9 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import com.j256.ormlite.dao.BaseDaoImpl;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.DatabaseTableConfig;
-import com.sk.weichat.bean.message.ChatMessage;
+import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 
 import java.sql.SQLException;
 

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import android.os.Handler;
 import android.text.TextUtils;
@@ -11,10 +11,10 @@ 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.sk.weichat.MyApplication;
-import com.sk.weichat.bean.circle.CircleMessage;
-import com.sk.weichat.db.SQLiteHelper;
-import com.sk.weichat.util.ThreadManager;
+import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.util.ThreadManager;
 
 import java.sql.SQLException;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import android.content.Context;
 import android.os.Handler;
@@ -14,27 +14,26 @@ 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.sk.weichat.MyApplication;
-import com.sk.weichat.R;
-import com.sk.weichat.bean.AttentionUser;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.message.ChatMessage;
-import com.sk.weichat.bean.message.MucRoom;
-import com.sk.weichat.bean.message.MucRoomMember;
-import com.sk.weichat.bean.message.NewFriendMessage;
-import com.sk.weichat.bean.message.XmppMessage;
-import com.sk.weichat.db.SQLiteHelper;
-import com.sk.weichat.db.SQLiteRawUtil;
-import com.sk.weichat.sp.TableVersionSp;
-import com.sk.weichat.ui.erp.util.ViewUtil;
-import com.sk.weichat.util.TimeUtils;
-import com.sk.weichat.xmpp.listener.ChatMessageListener;
+import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.xzjmyk.pm.activity.MyApplication;
+
+import com.xzjmyk.pm.activity.bean.AttentionUser;
+import com.xzjmyk.pm.activity.bean.Friend;
+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.XmppMessage;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
+import com.xzjmyk.pm.activity.sp.TableVersionSp;
+import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
 
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-
+import com.xzjmyk.pm.activity.R;
 /**
  * 访问朋友数据的Dao
  *
@@ -371,7 +370,7 @@ public class FriendDao {
 			builder.selectRaw("sum(unReadNum)");
 			// 条件 好友status2，显示系统号8
 			builder.where().eq("ownerId", ownerId).and().ge("status", 2).and().le("status", 8)
-			.and().notIn("nickName","公告","新闻","通知");
+			.and().notIn("nickName", "公告", "新闻", "通知");
 			GenericRawResults<String[]> results = friendDao.queryRaw(builder.prepareStatementString());
 			if (results != null) {
 				String[] first = results.getFirstResult();

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import android.os.Handler;
 
@@ -6,9 +6,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.DeleteBuilder;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.MyPhoto;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.MyPhoto;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
@@ -7,9 +7,9 @@ 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.sk.weichat.MyApplication;
-import com.sk.weichat.bean.message.NewFriendMessage;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

WeiChat/src/main/java/com/sk/weichat/db/dao/OnCompleteListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/OnCompleteListener.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 public interface OnCompleteListener {
 	void onCompleted();

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

@@ -1,11 +1,11 @@
-package com.sk.weichat.db.dao;
+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.sk.weichat.MyApplication;
-import com.sk.weichat.bean.TableConstant;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.TableConstant;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.db.dao;
+package com.xzjmyk.pm.activity.db.dao;
 
 import android.util.Log;
 
@@ -7,10 +7,10 @@ import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.UpdateBuilder;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.Company;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.Company;
+import com.xzjmyk.pm.activity.bean.User;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
 
 import java.sql.SQLException;
 

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

@@ -1,12 +1,12 @@
-package com.sk.weichat.db.dao;
+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.j256.ormlite.stmt.QueryBuilder;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.VideoFile;
-import com.sk.weichat.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.bean.VideoFile;
+import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.MyApplication;
 
 import java.sql.SQLException;
 import java.util.List;

WeiChat/src/main/java/com/sk/weichat/downloader/DownLoadingInfo.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownLoadingInfo.java

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

WeiChat/src/main/java/com/sk/weichat/downloader/DownloadListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloadListener.java

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

WeiChat/src/main/java/com/sk/weichat/downloader/DownloadProgressListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloadProgressListener.java

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

WeiChat/src/main/java/com/sk/weichat/downloader/DownloadTask.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloadTask.java

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

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.downloader;
+package com.xzjmyk.pm.activity.downloader;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -6,8 +6,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ProgressBar;
 
-import com.sk.weichat.downloader.FailReason.FailType;
-
 import java.io.File;
 
 /**
@@ -77,7 +75,7 @@ public class Downloader {
 		
 		if (TextUtils.isEmpty(uri)) {
 			mEngine.cancelDisplayTaskFor(viewAware);
-			listener.onFailed(uri, new FailReason(FailType.URI_EMPTY, new NullPointerException()),viewAware.getWrappedView());
+			listener.onFailed(uri, new FailReason(FailReason.FailType.URI_EMPTY, new NullPointerException()),viewAware.getWrappedView());
 			return;
 		}
 		

WeiChat/src/main/java/com/sk/weichat/downloader/DownloaderEngine.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/DownloaderEngine.java

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

WeiChat/src/main/java/com/sk/weichat/downloader/FailReason.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/FailReason.java

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

WeiChat/src/main/java/com/sk/weichat/downloader/ViewAware.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/downloader/ViewAware.java

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

WeiChat/src/main/java/com/sk/weichat/helper/AvatarHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/AvatarHelper.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.helper;
+package com.xzjmyk.pm.activity.helper;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.MemoryCacheUtil;
 import com.nostra13.universalimageloader.core.imageaware.ImageAware;
-import com.sk.weichat.MyApplication;
+import com.xzjmyk.pm.activity.MyApplication;
 
 import java.io.File;
 import java.io.IOException;

WeiChat/src/main/java/com/sk/weichat/helper/FileDataHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/FileDataHelper.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.helper;
+package com.xzjmyk.pm.activity.helper;
 
 import android.content.Context;
 import android.os.Handler;
@@ -7,11 +7,11 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.sk.weichat.volley.ArrayResult;
-import com.sk.weichat.volley.ObjectResult;
-import com.sk.weichat.volley.Result;
-import com.sk.weichat.volley.StringJsonArrayRequest.Listener;
-import com.sk.weichat.volley.StringJsonObjectRequest;
+import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+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.StringJsonObjectRequest;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -93,7 +93,7 @@ public class FileDataHelper {
 
 	// //////////////////////////////////////////////// Read部分
 
-	public static <T> void readArrayData(Context context, String ownerId, String fileName, Listener<T> listener, Class<T> clazz) {
+	public static <T> void readArrayData(Context context, String ownerId, String fileName, StringJsonArrayRequest.Listener<T> listener, Class<T> clazz) {
 		String ownerFileName = fileName + ownerId;
 		readArrayData(context, ownerFileName, listener, clazz);
 	}
@@ -103,7 +103,7 @@ public class FileDataHelper {
 	 * @param context
 	 * @param
 	 */
-	public static <T> void readArrayData(final Context context, final String fileName, final Listener<T> listener, final Class<T> clazz) {
+	public static <T> void readArrayData(final Context context, final String fileName, final StringJsonArrayRequest.Listener<T> listener, final Class<T> clazz) {
 		if (listener == null) {// 如果监听为null，那么读取数据就没意义，直接返回
 			return;
 		}
@@ -164,7 +164,7 @@ public class FileDataHelper {
 		}).start();
 	}
 
-	private static <T> void post(Handler handler, final Listener<T> listener, final ArrayResult<T> result) {
+	private static <T> void post(Handler handler, final StringJsonArrayRequest.Listener<T> listener, final ArrayResult<T> result) {
 		handler.post(new Runnable() {
 			@Override
 			public void run() {
@@ -194,7 +194,7 @@ public class FileDataHelper {
 	 * @param
 	 */
 	public static <T> void readObjectData(final Context context, final String fileName,
-			final com.sk.weichat.volley.StringJsonObjectRequest.Listener<T> listener, final Class<T> clazz) {
+			final StringJsonObjectRequest.Listener<T> listener, final Class<T> clazz) {
 		if (listener == null) {// 如果监听为null，那么读取数据就没意义，直接返回
 			return;
 		}

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

@@ -1,25 +1,24 @@
-package com.sk.weichat.helper;
+package com.xzjmyk.pm.activity.helper;
 
 import android.content.Context;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.AttentionUser;
-import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.circle.CircleMessage;
-import com.sk.weichat.broadcast.CardcastUiUpdateUtil;
-import com.sk.weichat.broadcast.MsgBroadcast;
-import com.sk.weichat.db.dao.ChatMessageDao;
-import com.sk.weichat.db.dao.CircleMessageDao;
-import com.sk.weichat.db.dao.FriendDao;
-import com.sk.weichat.sp.TableVersionSp;
-import com.sk.weichat.util.TimeUtils;
-import com.sk.weichat.volley.ArrayResult;
-import com.sk.weichat.volley.FastVolley;
-import com.sk.weichat.volley.Result;
-import com.sk.weichat.volley.StringJsonArrayRequest;
-import com.sk.weichat.volley.StringJsonArrayRequest.Listener;
+import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
+import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
+import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
+import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.xzjmyk.pm.activity.sp.TableVersionSp;
+import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.volley.ArrayResult;
+import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.AttentionUser;
+import com.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
+import com.xzjmyk.pm.activity.volley.FastVolley;
 
 import java.util.HashMap;
 import java.util.List;
@@ -169,7 +168,7 @@ public class FriendHelper {
 					@Override
 					public void onErrorResponse(VolleyError arg0) {
 					}
-				}, new Listener<CircleMessage>() {
+				}, new StringJsonArrayRequest.Listener<CircleMessage>() {
 					@Override
 					public void onResponse(ArrayResult<CircleMessage> result) {
 						boolean success = Result.defaultParser(context, result, false);

WeiChat/src/main/java/com/sk/weichat/helper/LoginHelper.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/LoginHelper.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.helper;
+package com.xzjmyk.pm.activity.helper;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,18 +8,18 @@ import android.util.Log;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
-import com.sk.weichat.AppConfig;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.LoginAuto;
-import com.sk.weichat.bean.LoginRegisterResult;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.db.dao.UserDao;
-import com.sk.weichat.sp.UserSp;
-import com.sk.weichat.ui.MainActivity;
-import com.sk.weichat.util.DeviceInfoUtil;
-import com.sk.weichat.volley.ObjectResult;
-import com.sk.weichat.volley.Result;
-import com.sk.weichat.volley.StringJsonObjectRequest;
+import com.xzjmyk.pm.activity.AppConfig;
+import com.xzjmyk.pm.activity.bean.LoginAuto;
+import com.xzjmyk.pm.activity.db.dao.UserDao;
+import com.xzjmyk.pm.activity.sp.UserSp;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
+import com.xzjmyk.pm.activity.bean.User;
+import com.xzjmyk.pm.activity.volley.ObjectResult;
+import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.helper;
+package com.xzjmyk.pm.activity.helper;
 
 import android.text.TextUtils;
 import android.util.Log;
@@ -7,12 +7,12 @@ import com.alibaba.fastjson.JSON;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.bean.UploadFileResult;
-import com.sk.weichat.bean.message.ChatMessage;
-import com.sk.weichat.bean.message.XmppMessage;
-import com.sk.weichat.db.dao.ChatMessageDao;
-import com.sk.weichat.volley.Result;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.bean.UploadFileResult;
+import com.xzjmyk.pm.activity.bean.message.ChatMessage;
+import com.xzjmyk.pm.activity.bean.message.XmppMessage;
+import com.xzjmyk.pm.activity.db.dao.ChatMessageDao;
+import com.xzjmyk.pm.activity.volley.Result;
 
 import org.apache.http.Header;
 

WeiChat/src/main/java/com/sk/weichat/helper/UploadService.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/UploadService.java

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

WeiChat/src/main/java/com/sk/weichat/sortlist/BaseComparator.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sortlist/BaseComparator.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sortlist;
+package com.xzjmyk.pm.activity.sortlist;
 
 import java.util.Comparator;
 

WeiChat/src/main/java/com/sk/weichat/sortlist/BaseSortModel.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sortlist/BaseSortModel.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sortlist;
+package com.xzjmyk.pm.activity.sortlist;
 
 public class BaseSortModel <T>{
 	public T bean;

WeiChat/src/main/java/com/sk/weichat/sortlist/PingYinUtil.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sortlist/PingYinUtil.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sortlist;
+package com.xzjmyk.pm.activity.sortlist;
 
 import android.text.TextUtils;
 

WeiChat/src/main/java/com/sk/weichat/sortlist/SideBar.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sortlist/SideBar.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sortlist;
+package com.xzjmyk.pm.activity.sortlist;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -11,8 +11,8 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
+import com.xzjmyk.pm.activity.R;
 
-import com.sk.weichat.R;
 
 import java.util.HashMap;
 import java.util.Map;

WeiChat/src/main/java/com/sk/weichat/sp/CommonSp.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sp/CommonSp.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sp;
+package com.xzjmyk.pm.activity.sp;
 
 import android.content.Context;
 import android.content.SharedPreferences;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.sp;
+package com.xzjmyk.pm.activity.sp;
 
 import android.content.Context;
 

WeiChat/src/main/java/com/sk/weichat/sp/TableVersionSp.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sp/TableVersionSp.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sp;
+package com.xzjmyk.pm.activity.sp;
 
 import android.content.Context;
 

WeiChat/src/main/java/com/sk/weichat/sp/UserSp.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/sp/UserSp.java

@@ -1,4 +1,4 @@
-package com.sk.weichat.sp;
+package com.xzjmyk.pm.activity.sp;
 
 import android.content.Context;
 

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.ui;
+package com.xzjmyk.pm.activity.ui;
 
 import android.app.Activity;
 import android.os.Bundle;

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

@@ -1,4 +1,4 @@
-package com.sk.weichat.ui;
+package com.xzjmyk.pm.activity.ui;
 
 import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
@@ -27,44 +27,43 @@ import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
-import com.sk.weichat.AppConfig;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.NetWorkObservable.NetWorkObserver;
-import com.sk.weichat.R;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.bean.circle.CircleMessage;
-import com.sk.weichat.bean.message.NewFriendMessage;
-import com.sk.weichat.broadcast.CardcastUiUpdateUtil;
-import com.sk.weichat.broadcast.MsgBroadcast;
-import com.sk.weichat.db.dao.FriendDao;
-import com.sk.weichat.db.dao.UserDao;
-import com.sk.weichat.helper.LoginHelper;
-import com.sk.weichat.ui.account.LoginActivity;
-import com.sk.weichat.ui.base.BaseActivity;
-import com.sk.weichat.ui.cardcast.AttentionFragment;
-import com.sk.weichat.ui.cardcast.FriendFragment;
-import com.sk.weichat.ui.cardcast.RoomFragment;
-import com.sk.weichat.ui.circle.BusinessCircleFragment;
-import com.sk.weichat.ui.erp.fragment.LinksManFragment;
-import com.sk.weichat.ui.erp.fragment.WorksFragment;
-import com.sk.weichat.ui.find.MyFriendFragment;
-import com.sk.weichat.ui.groupchat.GroupChatFragment;
-import com.sk.weichat.ui.me.MeFragment;
-import com.sk.weichat.ui.me.ScreenListener;
-import com.sk.weichat.ui.message.MessageFragment;
-import com.sk.weichat.ui.nearby.NearbyFragment;
-import com.sk.weichat.util.Constants;
-import com.sk.weichat.util.PreferenceUtils;
-import com.sk.weichat.util.ToastUtil;
-import com.sk.weichat.view.DivideRadioGroup;
-import com.sk.weichat.volley.ArrayResult;
-import com.sk.weichat.volley.FastVolley;
-import com.sk.weichat.volley.Result;
-import com.sk.weichat.volley.StringJsonArrayRequest;
-import com.sk.weichat.xmpp.CoreService;
-import com.sk.weichat.xmpp.CoreService.CoreServiceBinder;
-import com.sk.weichat.xmpp.ListenerManager;
-import com.sk.weichat.xmpp.listener.AuthStateListener;
+import com.xzjmyk.pm.activity.AppConfig;
+import com.xzjmyk.pm.activity.NetWorkObservable;
+import com.xzjmyk.pm.activity.bean.circle.CircleMessage;
+import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
+import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
+import com.xzjmyk.pm.activity.db.dao.UserDao;
+import com.xzjmyk.pm.activity.ui.cardcast.AttentionFragment;
+import com.xzjmyk.pm.activity.ui.cardcast.FriendFragment;
+import com.xzjmyk.pm.activity.ui.cardcast.RoomFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.LinksManFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
+import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
+import com.xzjmyk.pm.activity.ui.me.MeFragment;
+import com.xzjmyk.pm.activity.ui.message.MessageFragment;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.view.DivideRadioGroup;
+import com.xzjmyk.pm.activity.volley.ArrayResult;
+import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.xzjmyk.pm.activity.xmpp.CoreService;
+import com.xzjmyk.pm.activity.xmpp.ListenerManager;
+import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.User;
+import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
+import com.xzjmyk.pm.activity.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.find.MyFriendFragment;
+import com.xzjmyk.pm.activity.ui.me.ScreenListener;
+import com.xzjmyk.pm.activity.ui.nearby.NearbyFragment;
+import com.xzjmyk.pm.activity.util.Constants;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.volley.FastVolley;
+import com.xzjmyk.pm.activity.volley.Result;
 
 import java.util.HashMap;
 import java.util.List;
@@ -81,7 +80,7 @@ import java.util.List;
  * @修改时间: $Date$
  * @修改的内容: TODO
  */
-public class MainActivity extends BaseActivity implements NetWorkObserver, AuthStateListener {
+public class MainActivity extends BaseActivity implements NetWorkObservable.NetWorkObserver, AuthStateListener {
     public final static String SIP_PASSWORD = "ms_2014_0528@sk!@#";
     public static String HASHCODE = "MainActivity";
     public static final String TIME_MAIN = "TIMEMAIN";
@@ -153,7 +152,7 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
-            mCoreService = ((CoreServiceBinder) service).getService();
+            mCoreService = ((CoreService.CoreServiceBinder) service).getService();
             mImStatus = mCoreService.isAuthenticated() ? AuthStateListener.AUTH_STATE_SUCCESS : AuthStateListener.AUTH_STATE_NOT;
         }
     };
@@ -396,7 +395,7 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
-            mXmppService = ((CoreServiceBinder) service).getService();
+            mXmppService = ((CoreService.CoreServiceBinder) service).getService();
         }
     };
     private IntentFilter fiter;

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

@@ -1,7 +1,6 @@
-package com.sk.weichat.ui;
+package com.xzjmyk.pm.activity.ui;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.util.Log;
 
@@ -10,17 +9,14 @@ import com.baidu.android.pushservice.PushMessageReceiver;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
-import com.sk.weichat.MyApplication;
-import com.sk.weichat.ui.erp.activity.WebViewLoadActivity;
-import com.sk.weichat.ui.erp.util.Blowfish;
-import com.sk.weichat.ui.erp.util.CommonUtil;
-import com.sk.weichat.ui.erp.util.JsonValidator;
-import com.sk.weichat.ui.erp.util.StringUtils;
-import com.sk.weichat.ui.erp.util.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 
 import org.apache.http.Header;
 
-import java.util.Date;
 import java.util.List;
 
 
@@ -124,10 +120,10 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 					CommonUtil.loadWebView(ct,url,titlePage,master,masterId,uu);
 				}
 			}else{
-				com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct,"缺少参数：platform");
+				ViewUtil.ToastMessage(ct, "缺少参数：platform");
 			}
 		}else{
-			com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct,"服务器未指定需要的参数");
+			ViewUtil.ToastMessage(ct, "服务器未指定需要的参数");
 		}
 	}