push

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

@@ -16,7 +16,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.core.xmpp.model.ChatMessage;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.message.InstantMessageActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;
 

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

@@ -76,8 +76,8 @@ import com.me.appme.pedometer.service.StepService;
 import com.me.appme.pedometer.utils.StepCountCheckUtil;
 import com.me.appme.settings.activity.FeedbackActivity;
 import com.uas.appcontact.listener.ImStatusListener;
-import com.uas.appcontact.ui.fragment.ContactFragment;
 import com.uas.appcontact.ui.fragment.GroupChatFragment;
+import com.uas.appcontact.ui.fragment.ContactsFragment;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
@@ -142,7 +142,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
     private WorksFragment mWorksFragment;//工作
     private GroupChatFragment mGroupChatFragment;//群聊
     private MeFragment mMeFragment;//我
-    private ContactFragment mBusinessCircleFragment;
+    private ContactsFragment mBusinessCircleFragment;
     public static String BAIDU_PUSH = "BAIDUPUSH";
     public static String UU_STEP = "UUSTEP";
     public static String Q_SEARCH = "Q_SEARCH";
@@ -281,7 +281,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
                 updateMessageTitle();
             } else if (checkedId == R.id.main_tab_two) {
                 if (mBusinessCircleFragment == null) {
-                    mBusinessCircleFragment = new ContactFragment();
+                    mBusinessCircleFragment = new ContactsFragment();
                 }
                 changeFragment(mBusinessCircleFragment, TAG_BusinessCircle);//发现
                 getSupportActionBar().setTitle(getString(R.string.contact_title));
@@ -574,6 +574,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
     private Handler handler = new Handler();
     private Runnable runnable = new MyRunnable();
     private Boolean firstRed = true;
+
     private void doHiTask() {
         int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
         if (isUUStep != 0 && StepCountCheckUtil.isSupportStepCountSensor(this)) { // 开启UU运动
@@ -596,14 +597,14 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
     }
 
     private void hiQuickSearch() {
-        int qs =  PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.Q_SEARCH);
+        int qs = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.Q_SEARCH);
         if (CommonUtil.isReleaseVersion() || MainActivity.class == null || qs == 1) return;
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                 QSearchPpwindowUtils.qSearchWindows(MainActivity.this);
+                QSearchPpwindowUtils.qSearchWindows(MainActivity.this);
             }
-        },4000);
+        }, 4000);
     }
 
     public class MyRunnable implements Runnable {
@@ -614,6 +615,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
             BadgeUtil.setBadgeCount(getApplicationContext(), mMsgUnReadNum, R.drawable.hongdian);//启动红点显示逻辑
         }
     }
+
     private PopupWindow popupWindow;
 
     private void initScoringWindows() {
@@ -879,7 +881,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         mWorksFragment = (WorksFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
         mGroupChatFragment = (GroupChatFragment) getSupportFragmentManager().findFragmentByTag(TAG_GROUP_CHAT);
         mMeFragment = (MeFragment) getSupportFragmentManager().findFragmentByTag(TAG_ME);
-        mBusinessCircleFragment = (ContactFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);
+        mBusinessCircleFragment = (ContactsFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);
     }
 
     /**

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

@@ -13,7 +13,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.utils.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.core.utils.helper.LoginHelper;
 
 

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

@@ -12,7 +12,7 @@ import android.widget.EditText;
 import com.common.hmac.Md5Util;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 
 /**
  * 注册输入密码界面

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

@@ -47,7 +47,7 @@ import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;

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

@@ -22,7 +22,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
 import com.xzjmyk.pm.activity.audio.RecordController;
 import com.xzjmyk.pm.activity.audio.RecordListener;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.core.utils.ToastUtil;
 
 import java.io.File;

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

@@ -28,7 +28,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.VideoFile;
 import com.xzjmyk.pm.activity.db.dao.VideoFileDao;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.tool.VideoPlayActivity;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;

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

@@ -61,7 +61,7 @@ import com.me.appme.other.activity.BasicInfoActivity;
 import com.me.appme.other.activity.RoomInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendBaiDuLocate;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/MultiImagePreviewActivity.java

@@ -27,7 +27,7 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 import com.core.xmpp.utils.AppConstant;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.im.Scheme;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SelectConstantActivity.java

@@ -11,7 +11,7 @@ import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.TableConstant;
 import com.xzjmyk.pm.activity.db.dao.TableConstantDao;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SelectConstantSectionActivity.java

@@ -11,7 +11,7 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.db.dao.TableConstantDao;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.view.PinnedSectionListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.TableConstant;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/WebViewActivity.java

@@ -6,7 +6,7 @@ import android.text.TextUtils;
 import android.webkit.WebSettings.ZoomDensity;
 import android.webkit.WebView;
 
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.R;
 
 /**

WeiChat/src/main/res/layout/chat.xml

@@ -20,7 +20,7 @@
             android:textColor="@color/dark_grey"
             android:visibility="gone" />
 
-        <com.uas.appcontact.ui.widget.ChatContentView
+        <com.core.xmpp.widget.ChatContentView
             android:id="@+id/chat_content_view"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true">
 
-            <com.uas.appcontact.ui.widget.ChatBottomView
+            <com.core.xmpp.widget.ChatBottomView
                 android:id="@+id/chat_bottom_view"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"

WeiChat/src/main/res/layout/chat_bottom.xml

@@ -111,7 +111,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
-        <com.uas.appcontact.ui.widget.ChatFaceView
+        <com.core.xmpp.widget.ChatFaceView
             xmlns:chatface="http://schemas.android.com/apk/res-auto"
             android:id="@+id/chat_face_view"
             android:layout_width="wrap_content"

WeiChat/src/main/res/layout/comment_bottom.xml

@@ -85,7 +85,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
-        <com.uas.appcontact.ui.widget.ChatFaceView
+        <com.core.xmpp.widget.ChatFaceView
             xmlns:chatface="http://schemas.android.com/apk/res-auto"
             android:id="@+id/chat_face_view"
             android:layout_width="wrap_content"

WeiChat/src/main/res/layout/p_msg_bottom_view.xml

@@ -50,7 +50,7 @@
             android:textColor="@color/white" />
     </RelativeLayout>
 
-    <com.uas.appcontact.ui.widget.ChatFaceView
+    <com.core.xmpp.widget.ChatFaceView
         xmlns:chatface="http://schemas.android.com/apk/res-auto"
         android:id="@+id/chat_face_view"
         android:layout_width="wrap_content"

app_core/common/src/main/java/com/core/xmpp/CoreService.java

@@ -38,7 +38,7 @@ public class CoreService extends Service {
 
     static {
         SERVICE_INTENT.setComponent(new ComponentName("com.xzjmyk.pm.activity",
-                "com.xzjmyk.pm.activity.xmpp.CoreService"));
+                "com.core.xmpp.CoreService"));
     }
 
     public static Intent getIntent() {

app_core/common/src/main/res/layout/activity_meeting.xml

@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"
-    android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetingActivity">
+    android:orientation="vertical">
 
     <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"

app_core/common/src/main/res/layout/chat_bottom.xml

@@ -111,7 +111,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
-        <com.xzjmyk.pm.activity.view.ChatFaceView
+        <com.core.xmpp.widget.ChatFaceView
             xmlns:chatface="http://schemas.android.com/apk/res-auto"
             android:id="@+id/chat_face_view"
             android:layout_width="wrap_content"

app_core/common/src/main/res/layout/comment_bottom.xml

@@ -85,7 +85,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
-        <com.xzjmyk.pm.activity.view.ChatFaceView
+        <com.core.xmpp.widget.ChatFaceView
             xmlns:chatface="http://schemas.android.com/apk/res-auto"
             android:id="@+id/chat_face_view"
             android:layout_width="wrap_content"

app_core/common/src/main/res/layout/fragment_contacts.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_main">
+
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
+        android:id="@+id/refreshListView"
+        style="@style/normalListView"
+        android:divider="@drawable/bg_bar" />
+
+    <TextView
+        android:id="@+id/dialogTV"
+        android:layout_width="80.0dip"
+        android:layout_height="80.0dip"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center"
+        android:background="@color/black_trans_99"
+        android:gravity="center"
+        android:textColor="#ffffffff"
+        android:textSize="30.0dip"
+        android:visibility="invisible" />
+
+    <com.core.widget.sortlist.SideBar
+        android:id="@+id/sidebar"
+        android:layout_width="30.0dip"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_gravity="right|center"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="120dp" />
+</RelativeLayout>

app_core/common/src/main/res/layout/p_msg_bottom_view.xml

@@ -50,7 +50,7 @@
             android:textColor="@color/white" />
     </RelativeLayout>
 
-    <com.xzjmyk.pm.activity.view.ChatFaceView
+    <com.core.xmpp.widget.ChatFaceView
         xmlns:chatface="http://schemas.android.com/apk/res-auto"
         android:id="@+id/chat_face_view"
         android:layout_width="wrap_content"

app_core/common/src/main/res/values/styles.xml

@@ -844,7 +844,9 @@
     <style name="missiion_style" parent="@style/ListViewBasic">
         <item name="android:dividerHeight">2px</item>
     </style>
-
+    <style name="normalListView" parent="ListViewBasic">
+        <item name="android:dividerHeight">@dimen/line</item>
+    </style>
     <style name="ListViewBasic">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>

app_modular/appcontact/src/main/java/com/me/appcontact/manager/ContactsManager.java → app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java

@@ -1,4 +1,4 @@
-package com.me.appcontact.manager;
+package com.uas.manager;
 
 
 import android.os.Bundle;
@@ -92,7 +92,8 @@ public class ContactsManager implements OnHttpResultListener {
         Bundle bundle = new Bundle();
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         bundle.putBoolean("isB2b", isB2b);
-        bundle.putSerializable("listener", listener);
+        if (listener != null)
+            bundle.putSerializable("OnEmployListener", listener);
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo : "mobile/getAllHrorgEmps.action";
         Request request = new Request.Bulider()
                 .setWhat(LOAD_COMPANY_WHAT)
@@ -114,10 +115,7 @@ public class ContactsManager implements OnHttpResultListener {
                 OnEmployListener listener = null;
                 if (bundle != null) {
                     isB2b = bundle.getBoolean("isB2b", false);
-                    Serializable serializable = bundle.getSerializable("listener");
-                    if (serializable instanceof OnEmployListener) {
-                        listener = (OnEmployListener) serializable;
-                    }
+                    listener = (OnEmployListener) bundle.getSerializable("OnEmployListener");
                 }
                 handEmployees(isB2b, JSON.parseObject(message), listener);
                 break;
@@ -131,7 +129,7 @@ public class ContactsManager implements OnHttpResultListener {
 
 
     private void handEmployees(final boolean isB2b, final JSONObject object, final OnEmployListener listener) {
-        ThreadUtil.getInstance().addLoopTask(new Runnable() {
+        ThreadUtil.getInstance().addTask(new Runnable() {
             @Override
             public void run() {
                 try {

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -108,18 +108,21 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
     private ServiceConnection mServiceConnection = new ServiceConnection() {
         @Override
         public void onServiceDisconnected(ComponentName name) {
+            LogUtil.i("onServiceDisconnected");
             mXmppService = null;
         }
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
             mXmppService = ((CoreService.CoreServiceBinder) service).getService();
+            LogUtil.i("onServiceConnected");
+            LogUtil.i("mXmppService=" + (mXmppService == null));
         }
     };
 
     private void initView() {
-        mlist= (PullToRefreshListView) findViewById(R.id.mList);
-        voiceSearchView= (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        mlist = (PullToRefreshListView) findViewById(R.id.mList);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         if (getIntent() != null) {
             type = getIntent().getIntExtra("type", 0);
             String title = getIntent().getStringExtra("title");
@@ -198,7 +201,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             @Override
             public void afterTextChanged(Editable s) {
                 searchKey = s.toString();
-                LogUtil.d("arison"," searchKey:"+searchKey);
+                LogUtil.d("arison", " searchKey:" + searchKey);
                 if (!StringUtil.isEmpty(s.toString())) {
                     mlist.setMode(PullToRefreshBase.Mode.DISABLED);
                     List<ContactsModel> cacheData = contactsDao.find(s.toString());
@@ -312,7 +315,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         model.setEmail("");
                         model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                         model.setPhone(entity.getPhone());
-                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
+                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
                         model.setCompany("");
                         tmodels.add(model);
                     }
@@ -332,7 +335,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         ThreadPool.getThreadPool().addTask(new Runnable() {
             @Override
             public void run() {
-                LogUtil.d("Test","isHasPermiss:"+isHasPermiss);
+                LogUtil.d("Test", "isHasPermiss:" + isHasPermiss);
                 if (isHasPermiss) {
                     List<Contacts> contacts =
                             ContactsUtils.getContacts1();
@@ -345,7 +348,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                             model.setEmail("");
                             model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                             model.setPhone(entity.getPhone());
-                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
+                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
                             model.setCompany("");
                             tmodels.add(model);
 
@@ -499,12 +502,12 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         if (model.getPhone().equals(telephone)) {
                             if (isfriend.equals("0")) {
                                 model.setType(2);//非好友
-                              model.setImid(String.valueOf(_id));
-                                contactsDao.update(model,"0");
+                                model.setImid(String.valueOf(_id));
+                                contactsDao.update(model, "0");
                             } else if (isfriend.equals("1")) {
                                 model.setType(1);//好友
                                 model.setImid(String.valueOf(_id));
-                                contactsDao.update(model,"0");
+                                contactsDao.update(model, "0");
                             }
                         }
                     }
@@ -561,7 +564,9 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                     // 发送推送的消息
                     NewFriendMessage mess = NewFriendMessage.createWillSendMessage(
                             MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
-                    mXmppService.sendNewFriendMessage(mUser.getUserId(), mess);
+                    LogUtil.i("mXmppService=" + (mXmppService == null));
+                    if (mXmppService != null)
+                        mXmppService.sendNewFriendMessage(mUser.getUserId(), mess);
                     // 添加为好友
                     NewFriendDao.getInstance().ascensionNewFriend(mess, Friend.STATUS_FRIEND);
 
@@ -585,7 +590,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         LogUtil.i("invite");
         final String name = CommonUtil.getName();
         final String phone = user.getPhone().trim().replaceAll(" ", "");
-        
+
 //        if (!com.xzjmyk.pm.activity.util.StringUtil.isMobileNumber(phone)) {
 //            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
 //            return;
@@ -708,7 +713,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                             model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                                             model.setPhone(entity.getPhone());
                                             //uu好友
-                                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
+                                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
                                             model.setCompany("");
                                             tmodels.add(model);
                                         }

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactFragment.java

@@ -63,7 +63,7 @@ import java.util.List;
 /**
  * Created by pengminggong on 2016/10/12.
  */
-public class ContactFragment extends EasyFragment implements View.OnClickListener,ContactsManager.OnEmployListener {
+public class ContactFragment extends EasyFragment implements View.OnClickListener, ContactsManager.OnEmployListener {
     private SideBar sidebar;
     private TextView text_dialog;
     private StickyListHeadersListView refreshListView;
@@ -132,9 +132,6 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.search) {
             if (!isB2b) {
-//                if (OAConfig.canShowCrm2_0())
-//                    startActivity(new Intent(getActivity(), AddContactsActivity.class));
-//                else
                 startActivity(new Intent(getActivity(), UserSearchActivity.class));
             } else {
                 showPopupWindow();
@@ -144,56 +141,41 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
 
     }
 
-    //弹出菜单
-    private PopupWindow setWindow = null;
 
     private void showPopupWindow() {
-        initMenuwindow();
-        setWindow.showAtLocation(getActivity().getWindow().getDecorView().
-                findViewById(android.R.id.content), Gravity.CENTER, 0, 0);
-        DisplayUtil.backgroundAlpha(getActivity(), 0.4f);
-
-    }
-
-    private TextView add_friend_tv;
-    private TextView add_people_tv;
-
-    private void initMenuwindow() {
         View viewContext = LayoutInflater.from(getActivity()).inflate(R.layout.contact_add_menu, null);
-        add_friend_tv = (TextView) viewContext.findViewById(R.id.add_friend_tv);
-        add_people_tv = (TextView) viewContext.findViewById(R.id.add_people_tv);
-        add_friend_tv.setOnClickListener(new View.OnClickListener() {
+        final PopupWindow setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        viewContext.findViewById(R.id.add_friend_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(getActivity(), UserSearchActivity.class));
-                closePopupWindow();
+                if (setWindow != null) {
+                    setWindow.dismiss();
+                }
             }
         });
-        add_people_tv.setOnClickListener(new View.OnClickListener() {
+        viewContext.findViewById(R.id.add_people_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(getActivity(), PlatContactAddPeopleActivity.class));
-                closePopupWindow();
-
+                if (setWindow != null) {
+                    setWindow.dismiss();
+                }
             }
         });
-        setWindow = new PopupWindow(viewContext,
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT, true);
         setWindow.setAnimationStyle(R.style.MenuAnimationFade);
         setWindow.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.bg_popuwin));
         setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
             @Override
             public void onDismiss() {
-                closePopupWindow();
+                DisplayUtil.backgroundAlpha(getActivity(), 1f);
             }
         });
-    }
-
-    private void closePopupWindow() {
-        if (setWindow != null)
-            setWindow.dismiss();
-        DisplayUtil.backgroundAlpha(getActivity(), 1f);
+        setWindow.showAtLocation(getActivity().getWindow().getDecorView().
+                findViewById(android.R.id.content), Gravity.CENTER, 0, 0);
+        DisplayUtil.backgroundAlpha(getActivity(), 0.4f);
     }
 
 
@@ -232,7 +214,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
                     mPullToRefreshView.setRefreshing(false, false);
                     mcProgressDialog.dismiss();
                 } else {
-                   ContactsManager.getInstance().loadContactByNet(ContactFragment.this);
+                    ContactsManager.getInstance().loadContactByNet(ContactFragment.this);
                 }
 
             }
@@ -271,8 +253,8 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         mcProgressDialog = CustomProgressDialog.createDialog(ct);
         comparator = new BaseComparator();
         loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-        setHeaderView();
         sidebar.setTextView(text_dialog);
+        setHeaderView();
         adapter = new FriendSortAdapter(ct, showDatas);
         refreshListView.setAdapter(adapter);
         loadData();
@@ -329,7 +311,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         ContactsManager.getInstance().loadContact(this);
     }
 
-    private void handlerData(List<BaseSortModel<Friend>> friends ) {
+    private void handlerData(List<BaseSortModel<Friend>> friends) {
         allDatas = friends;
         if (voiceSearchView == null || TextUtils.isEmpty(voiceSearchView.getText())) {//没有搜索数据
             showDatas = friends;
@@ -385,7 +367,6 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     }
 
 
-
     /**
      * 将Rep转化为Friend对象
      *
@@ -438,8 +419,6 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     }
 
 
-
-
     @Override
     public void onClick(View view) {
         Intent intent = null;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactsFragment.java

@@ -0,0 +1,451 @@
+package com.uas.appcontact.ui.fragment;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
+import com.common.thread.ThreadUtil;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.EasyFragment;
+import com.core.broadcast.MsgBroadcast;
+import com.core.model.EmployeesEntity;
+import com.core.model.Friend;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.utils.CommonUtil;
+import com.core.widget.CustomProgressDialog;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
+import com.core.widget.sortlist.BaseComparator;
+import com.core.widget.sortlist.BaseSortModel;
+import com.core.widget.sortlist.PingYinUtil;
+import com.core.widget.sortlist.SideBar;
+import com.core.xmpp.utils.AppConstant;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.uas.appcontact.R;
+import com.uas.appcontact.adapter.FriendSortAdapter;
+import com.uas.appcontact.listener.ImStatusListener;
+import com.uas.appcontact.manager.ContactsManager;
+import com.uas.appcontact.ui.activity.CommonFragmentActivity;
+import com.uas.appcontact.ui.activity.CompanyContactsActivity;
+import com.uas.appcontact.ui.activity.ContactsActivity;
+import com.uas.appcontact.ui.activity.MyFriendActivity;
+import com.uas.appcontact.ui.activity.NewFriendActivity;
+import com.uas.appcontact.ui.activity.PlatContactAddPeopleActivity;
+import com.uas.appcontact.ui.activity.UserSearchActivity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by Bitliker on 2017/9/1.
+ */
+
+public class ContactsFragment extends EasyFragment
+        implements SideBar.OnTouchingLetterChangedListener
+        , PullToRefreshBase.OnRefreshListener<ListView>
+        , AdapterView.OnItemClickListener
+        , View.OnClickListener
+        , ContactsManager.OnEmployListener {
+
+    private PullToRefreshListView refreshListView;
+    private TextView dialogTV;
+    private TextView uuRedTag;
+    private SideBar sidebar;
+    private VoiceSearchView voiceSearchView;
+
+    private BaseComparator comparator;
+    private List<BaseSortModel<Friend>> allDatas;
+    private List<BaseSortModel<Friend>> showDatas;
+    private FriendSortAdapter adapter;
+    private String userId;
+    private ImStatusListener mListener;
+    private boolean isB2b;
+    private CustomProgressDialog progressDialog;
+
+    private BroadcastReceiver receiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals("com.app.home.update") || intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更，重新刷新数据，初始化任务
+                loadData();
+            }
+        }
+    };
+
+    @Override
+    protected int inflateLayoutId() {
+        return R.layout.fragment_contacts;
+    }
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        IntentFilter inputFilter = new IntentFilter();
+        inputFilter.addAction(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE);
+        inputFilter.addAction("com.app.home.update");
+        LocalBroadcastManager.getInstance(ct).registerReceiver(receiver, inputFilter);
+        setHasOptionsMenu(true);
+        isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LocalBroadcastManager.getInstance(ct).unregisterReceiver(receiver);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_nearby, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.search) {
+            if (!isB2b) {
+                startActivity(new Intent(getActivity(), UserSearchActivity.class));
+            } else {
+                showPopupWindow();
+            }
+        }
+        return super.onOptionsItemSelected(item);
+
+    }
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        if (createView) {
+            initView();
+        }
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof ImStatusListener) {
+            mListener = (ImStatusListener) context;
+        }
+    }
+
+    private void initView() {
+        progressDialog = CustomProgressDialog.createDialog(getContext());
+        showDatas = new ArrayList<>();
+        allDatas = new ArrayList<>();
+        userId = MyApplication.getInstance().getLoginUserId();
+        refreshListView = (PullToRefreshListView) findViewById(R.id.refreshListView);
+        dialogTV = (TextView) findViewById(R.id.dialogTV);
+        sidebar = (SideBar) findViewById(R.id.sidebar);
+        sidebar.setTextView(dialogTV);
+        sidebar.setOnTouchingLetterChangedListener(this);
+        refreshListView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+        refreshListView.setOnRefreshListener(this);
+        refreshListView.setOnItemClickListener(this);
+        comparator = new BaseComparator();
+        initHeaderView();
+        adapter = new FriendSortAdapter(ct, showDatas);
+        refreshListView.setAdapter(adapter);
+        loadData();
+    }
+
+    private void showPopupWindow() {
+        View viewContext = LayoutInflater.from(getActivity()).inflate(R.layout.contact_add_menu, null);
+        final PopupWindow setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        viewContext.findViewById(R.id.add_friend_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getActivity(), UserSearchActivity.class));
+                if (setWindow != null) {
+                    setWindow.dismiss();
+                }
+            }
+        });
+        viewContext.findViewById(R.id.add_people_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getActivity(), PlatContactAddPeopleActivity.class));
+                if (setWindow != null) {
+                    setWindow.dismiss();
+                }
+            }
+        });
+        setWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        setWindow.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.bg_popuwin));
+        setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(getActivity(), 1f);
+            }
+        });
+        setWindow.showAtLocation(getActivity().getWindow().getDecorView().
+                findViewById(android.R.id.content), Gravity.CENTER, 0, 0);
+        DisplayUtil.backgroundAlpha(getActivity(), 0.4f);
+    }
+
+    private void initHeaderView() {
+        View headview = LayoutInflater.from(ct).inflate(R.layout.header_fragment_contact, null);
+        refreshListView.getRefreshableView().addHeaderView(headview);
+        voiceSearchView = (VoiceSearchView) headview.findViewById(R.id.voiceSearchView);
+        headview.findViewById(R.id.company).setOnClickListener(this);//企业结构
+        headview.findViewById(R.id.group).setOnClickListener(this);//商务群
+        headview.findViewById(R.id.uu_friend).setOnClickListener(this);//我的好友
+        headview.findViewById(R.id.peculiar_tv).setOnClickListener(this);//我的好友
+        uuRedTag = (TextView) headview.findViewById(R.id.tv_uu_new);
+        uuRedTag.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, Constants.SET_UU_NEW, false) ? View.GONE : View.VISIBLE);
+        voiceSearchView.addTextChangedListener(new EditChangeListener() {
+            @Override
+            public void afterTextChanged(Editable editable) {
+                String str = editable == null ? "" : editable.toString();
+                upDataBySearch(str);
+                adapter.setData(showDatas);
+            }
+        });
+    }
+
+
+    void showLoading() {
+        if (!refreshListView.isRefreshing()) {
+            progressDialog.show();
+        }
+    }//显示刷新
+
+    void dimssLoading() {
+        if (progressDialog != null && progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+        if (refreshListView.isRefreshing()) {
+            refreshListView.onRefreshComplete();
+        }
+    }//关闭刷新
+
+    private void loadData() {
+        showLoading();
+        ContactsManager.getInstance().loadContact(this);
+    }
+
+    @Override
+    public void onTouchingLetterChanged(String s) {
+        // 该字母首次出现的位置
+        int position = adapter.getPositionForSection(s.charAt(0));
+        if (position != -1) {
+            refreshListView.getRefreshableView().setSelection(position);
+        }
+        if ("↑".equals(s)) {
+            refreshListView.getRefreshableView().setSelection(0);
+        }
+    }
+
+    @Override
+    public void onTouchingUp() {
+
+    }
+
+    @Override
+    public void onRefresh(PullToRefreshBase<ListView> refreshView) {
+        if ("1".equals(CommonUtil.getUserRole())) {
+            refreshListView.setRefreshing(false);
+            dimssLoading();
+        } else {
+            ContactsManager.getInstance().loadContactByNet(this);
+        }
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        List<BaseSortModel<Friend>> list = adapter.getmSortFriends();
+        if (!ListUtils.isEmpty(list)) {
+            Friend friend = list.get((int) id).getBean();
+            clickFriend(friend);
+        }
+    }
+
+    private void clickFriend(Friend friend) {
+        Intent intent = null;
+        if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友消息
+            intent = new Intent(getActivity(), NewFriendActivity.class);
+        } else if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {// 新朋友消息
+            intent = new Intent("com.modular.message.ChatActivity");
+            intent.putExtra("friend", friend);
+        } else {
+            intent = new Intent("com.modular.basic.BasicInfoActivity");
+            intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());
+            intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
+            intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getNickName());
+            intent.putExtra(AppConstant.EXTRA_EM_CODE, friend.getEmCode());
+            intent.putExtra("friend", friend);
+        }
+        startActivity(intent);
+    }
+
+    @Override
+    public void onClick(View view) {
+        Intent intent = null;
+        int id = view.getId();
+        if (id == R.id.company) {
+            intent = new Intent(ct, CompanyContactsActivity.class);
+            ct.startActivity(intent);
+        } else if (id == R.id.group) {
+            intent = new Intent(ct, CommonFragmentActivity.class);
+            intent.putExtra("imStatus", mListener == null ? 0 : mListener.getmImStatus());
+            intent.putExtra("type", Constants.TYPE_CHAT_All);
+            ct.startActivity(intent);
+        } else if (id == R.id.uu_friend) {
+            startActivity(new Intent(ct, ContactsActivity.class));
+            uuRedTag.setVisibility(View.GONE);
+            CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.SET_UU_NEW, true);
+        } else if (id == R.id.peculiar_tv) {
+            intent = new Intent(ct, MyFriendActivity.class);
+            intent.putExtra("isPeculiar", true);
+            ct.startActivity(intent);
+        }
+    }
+
+
+    @Override
+    public void callback(List<EmployeesEntity> employees) {
+        try {
+            final List<BaseSortModel<Friend>> friends = getFriendsByErpDB(employees);
+            ThreadUtil.getInstance().addTask(new Runnable() {
+                @Override
+                public void run() {
+                    handlerData(friends);
+                }
+            });
+
+        } catch (Exception e) {
+            dimssLoading();
+        }
+    }
+
+    /**
+     * 想获取到的人员列表数据整合为Friend数据列表
+     *
+     * @return 查询到数据列表
+     */
+    private List<BaseSortModel<Friend>> getFriendsByErpDB(List<EmployeesEntity> emList) throws Exception {
+        if (ListUtils.isEmpty(emList)) return null;
+        List<BaseSortModel<Friend>> list = new ArrayList<>();
+        for (EmployeesEntity e : emList) {
+            list.add(getFriendByErp(e));
+        }
+        if (ListUtils.isEmpty(list)) {
+            list = new ArrayList<>();
+        } else {
+            Collections.sort(list, comparator);
+        }
+        return list;
+    }
+
+
+    private void handlerData(List<BaseSortModel<Friend>> friends) {
+        allDatas = friends;
+        if (voiceSearchView == null || TextUtils.isEmpty(voiceSearchView.getText())) {//没有搜索数据
+            showDatas = friends;
+        } else {//
+            String str = voiceSearchView.getText().toString();
+            upDataBySearch(str);
+        }
+        OAHttpHelper.getInstance().post(new Runnable() {
+            @Override
+            public void run() {
+                if (adapter == null) return;
+                adapter.setData(showDatas);
+                dimssLoading();
+            }
+        });
+    }
+
+    /**
+     * 将Rep转化为Friend对象
+     *
+     * @param e 员工对象
+     * @return
+     */
+    private BaseSortModel<Friend> getFriendByErp(EmployeesEntity e) {
+        Friend friend = new Friend();
+        friend.setTimeCreate((int) (System.currentTimeMillis() / 1000));
+        friend.setOwnerId(userId);
+        friend.setUserId(String.valueOf(e.getEm_IMID()));
+        friend.setNickName(e.getEM_NAME());
+        friend.setPhone(e.getEM_MOBILE());
+        friend.setDepart(e.getEM_DEPART());
+        friend.setPosition(e.getEM_POSITION());
+        friend.setEmCode(e.getEM_CODE());
+        friend.setPrivacy(e.getEM_EMAIL());
+        friend.setCompanyId(0);
+        friend.setRoomFlag(0);// 0朋友 1群组
+        friend.setStatus(Friend.STATUS_UNKNOW);
+        BaseSortModel<Friend> mode = new BaseSortModel<>();
+        mode.setBean(friend);
+        setSortCondition(mode);
+        return mode;
+    }
+
+    /*设置当前mode所在的索引值*/
+    private void setSortCondition(BaseSortModel<Friend> mode) {
+        Friend friend = mode.getBean();
+        if (friend == null) {
+            return;
+        }
+        String name = friend.getShowName();
+        String wholeSpell = PingYinUtil.getPingYin(name);
+        if (!StringUtil.isEmpty(wholeSpell)) {
+            try {
+                String firstLetter = Character.toString(wholeSpell.charAt(0));
+                sidebar.addExist(firstLetter);
+                mode.setWholeSpell(wholeSpell);
+                mode.setFirstLetter(firstLetter);
+                mode.setSimpleSpell(PingYinUtil.converterToFirstSpell(name));
+            } catch (NullPointerException e) {
+
+            }
+        } else {// 如果全拼为空，理论上是一种错误情况，因为这代表着昵称为空
+            mode.setWholeSpell("#");
+            mode.setFirstLetter("#");
+            mode.setSimpleSpell("#");
+        }
+    }
+
+    /**
+     * 当搜索框有字时候获取
+     *
+     * @param str 搜索框文字
+     */
+    private void upDataBySearch(String str) {
+        if (ListUtils.isEmpty(allDatas)) return;
+        showDatas = new ArrayList<>();
+        for (BaseSortModel<Friend> e : allDatas) {
+            String text = e.getBean().getShowName() + e.getBean().getDepart() + e.getBean().getPosition() + e.getBean().getPhone();
+            if (StringUtil.isInclude(text, str)) {
+                showDatas.add(e);
+            }
+        }
+    }
+
+}

app_modular/appme/src/main/java/com/me/appme/settings/model/Area.java

@@ -1,164 +0,0 @@
-package com.me.appme.settings.model;
-
-import android.text.TextUtils;
-
-import com.core.app.MyApplication;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-import com.me.appme.dao.AreasDao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@DatabaseTable(tableName = "tb_areas")
-public class Area {
-
-	public static final int AREA_DATA_CHINA_ID = 1;// 中国
-
-	public static final int AREA_TYPE_COUNTRY = 1;// 国家
-	public static final int AREA_TYPE_PROVINCE = 2;// 省份
-	public static final int AREA_TYPE_CITY = 3;// 城市
-	public static final int AREA_TYPE_COUNTY = 4;// 县
-
-	public static final List<Area> HOT_CITYS;
-	static {
-		HOT_CITYS = new ArrayList<Area>();
-		Area area1 = AreasDao.getInstance().getArea(310100);// 上海市
-		Area area2 = AreasDao.getInstance().getArea(110100);// 北京市
-		Area area3 = AreasDao.getInstance().getArea(440100);// 广州市
-		Area area4 = AreasDao.getInstance().getArea(440300);// 深圳市
-		HOT_CITYS.add(area1);
-		HOT_CITYS.add(area2);
-		HOT_CITYS.add(area3);
-		HOT_CITYS.add(area4);
-	}
-
-	@DatabaseField(generatedId = true)
-	private int id;
-
-	@DatabaseField
-	private int parent_id;
-
-	@DatabaseField
-	private int type;
-
-	@DatabaseField
-	private String name;
-
-	@DatabaseField
-	private String zip;
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public int getParent_id() {
-		return parent_id;
-	}
-
-	public void setParent_id(int parent_id) {
-		this.parent_id = parent_id;
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getZip() {
-		return zip;
-	}
-
-	public void setZip(String zip) {
-		this.zip = zip;
-	}
-
-	public static String getProvinceCityString(int provinceId, int cityId) {
-		String provinceStr = null;
-		String cityStr = null;
-		if (provinceId != 0) {
-			Area area = AreasDao.getInstance().getArea(provinceId);
-			provinceStr = area != null ? area.getName() : null;
-		}
-		if (cityId != 0) {
-			Area area = AreasDao.getInstance().getArea(cityId);
-			cityStr = area != null ? area.getName() : null;
-		}
-
-		if (!TextUtils.isEmpty(provinceStr) && !TextUtils.isEmpty(cityStr)) {
-			return provinceStr + "-" + cityStr;
-		} else if (!TextUtils.isEmpty(provinceStr) && TextUtils.isEmpty(cityStr)) {
-			return provinceStr;
-		} else if (TextUtils.isEmpty(provinceStr) && !TextUtils.isEmpty(cityStr)) {
-			return cityStr;
-		} else {
-			return "";
-		}
-	}
-
-	public static String getCityAreaString(int cityId, int areaId) {
-		String cityStr = null;
-		String areaStr = null;
-		if (cityId != 0) {
-			Area area = AreasDao.getInstance().getArea(cityId);
-			cityStr = area != null ? area.getName() : null;
-		}
-		if (areaId != 0) {
-			Area area = AreasDao.getInstance().getArea(areaId);
-			areaStr = area != null ? area.getName() : null;
-		}
-		if (!TextUtils.isEmpty(cityStr) && !TextUtils.isEmpty(areaStr)) {
-			return cityStr + "-" + areaStr;
-		} else if (!TextUtils.isEmpty(cityStr) && TextUtils.isEmpty(areaStr)) {
-			return cityStr;
-		} else if (TextUtils.isEmpty(cityStr) && !TextUtils.isEmpty(areaStr)) {
-			return areaStr;
-		} else {
-			return "";
-		}
-	}
-
-	public static int getDefaultCountyId() {// 获取默认的国家的Id
-		return AREA_DATA_CHINA_ID;
-	}
-
-	public static Area getDefaultProvince() {// 获取默认的省份
-		Area area = null;
-		String provinceName = MyApplication.getInstance().getBdLocationHelper().getProvinceName();
-		if (!TextUtils.isEmpty(provinceName)) {
-			area = AreasDao.getInstance().searchByName(provinceName);
-		}
-		return area;
-	}
-
-	public static Area getDefaultCity() {// 获取默认的城市
-		Area area = null;
-		String cityName = MyApplication.getInstance().getBdLocationHelper().getCityName();
-		if (!TextUtils.isEmpty(cityName)) {
-			area = AreasDao.getInstance().searchByName(cityName);
-		}
-		return area;
-	}
-
-	public static Area getDefaultDistrict(int cityId) {// 获取默认的区县
-		String districtName = MyApplication.getInstance().getBdLocationHelper().getDistrictName();
-		Area area = AreasDao.getInstance().searchByNameAndParentId(cityId, districtName);
-		return area;
-	}
-
-}

app_modular/appme/src/main/java/com/me/appme/other/fragment/FriendFragment.java → app_modular/appme/src/main/java/com/uas/appme/other/fragment/FriendFragment.java

@@ -49,7 +49,6 @@ import com.me.appme.R;
 import com.me.appme.other.activity.BasicInfoActivity;
 import com.me.appme.other.activity.CardcastActivity;
 import com.me.appme.other.adapter.FriendSortAdapter;
-import com.uas.appcontact.ui.activity.ChatActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 
 import java.util.ArrayList;
@@ -166,8 +165,8 @@ public class FriendFragment extends EasyFragment {
                 if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友消息
                     intent = new Intent(getActivity(), NewFriendActivity.class);
                 } else if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {// 新朋友消息
-                    intent = new Intent(getActivity(), ChatActivity.class);
-                    intent.putExtra(ChatActivity.FRIEND, friend);
+                    intent = new Intent("com.modular.message.ChatActivity");
+                    intent.putExtra(AppConstant.FRIEND, friend);
                 } else {
                     intent = new Intent(getActivity(), BasicInfoActivity.class);
                     intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());