提交备份保存

WeiChat/src/main/AndroidManifest.xml

@@ -363,7 +363,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.uas.appcontact.ui.activity.BasicInfoActivity"
+            android:name=".ui.circle.BasicInfoActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.basic.BasicInfoActivity"/>
@@ -1084,6 +1084,7 @@
             android:windowSoftInputMode="adjustPan"/>
         <activity android:name=".ui.account.RegisterSelectActivity"></activity>
         <activity android:name=".ui.me.TemperatureActivity"></activity>
+        <activity android:name="com.uas.appcontact.ui.activity.MyFriendActivity"/>
         <!--<activity android:name=".ui.me.ToastDemoActivity"></activity>-->
     </application>
 

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

@@ -36,7 +36,7 @@ import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;

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

@@ -42,7 +42,7 @@ import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.uas.appcontact.ui.activity.ChatActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 import com.xzjmyk.pm.activity.R;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/BasicInfoActivity.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -1,4 +1,4 @@
-package com.uas.appcontact.ui.activity;
+package com.xzjmyk.pm.activity.ui.circle;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -71,6 +71,7 @@ import com.core.xmpp.utils.CardcastUiUpdateUtil;
 import com.uas.appcontact.R;
 import com.uas.appcontact.db.ContactsDao;
 import com.uas.appcontact.model.contacts.ContactsModel;
+import com.uas.appcontact.ui.activity.ChatActivity;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -405,11 +405,11 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                 }
 //                Intent intent = new Intent(BusinessCircleActivity.this,PersonalQzoneActivity.class);
                 else if (isMySpace()) {
-                    Intent intent = new Intent(BusinessCircleActivity.this, com.uas.appcontact.ui.activity.BasicInfoActivity.class);
+                    Intent intent = new Intent(BusinessCircleActivity.this, BasicInfoActivity.class);
                     intent.putExtra(AppConstant.EXTRA_USER_ID, mLoginUserId);
                     startActivity(intent);
                 } else {
-                    Intent intent = new Intent(BusinessCircleActivity.this, com.uas.appcontact.ui.activity.BasicInfoActivity.class);
+                    Intent intent = new Intent(BusinessCircleActivity.this, BasicInfoActivity.class);
                     intent.putExtra(AppConstant.EXTRA_USER_ID, mUserId);
                     startActivity(intent);
                 }

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

@@ -341,7 +341,7 @@ public class BusinessCircleFragment extends EasyFragment implements showCEView {
 			@Override
 			public void onClick(View v) {// 进入个人资料页
 				Log.d("wang", "点击了mAvatarImg");
-				Intent intent = new Intent(getActivity(), com.uas.appcontact.ui.activity.BasicInfoActivity.class);
+				Intent intent = new Intent(getActivity(), BasicInfoActivity.class);
 				if (isMyBusiness() || isMySpace()) {
 					intent.putExtra(AppConstant.EXTRA_USER_ID, mLoginUserId);
 				} else {

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

@@ -413,7 +413,7 @@ public class PersonalQzoneActivity extends BaseActivity implements showCEView {
         mAvatarImg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {// 进入个人资料页
-                Intent intent = new Intent(PersonalQzoneActivity.this,com.uas.appcontact.ui.activity.BasicInfoActivity.class);
+                Intent intent = new Intent(PersonalQzoneActivity.this,BasicInfoActivity.class);
                 if (isMyBusiness() || isMySpace()) {
                     intent.putExtra(AppConstant.EXTRA_USER_ID, mLoginUserId);
                 } else {

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

@@ -29,7 +29,7 @@ import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.core.xmpp.dao.FriendDao;
 import com.core.utils.helper.AvatarHelper;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;

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

@@ -35,7 +35,7 @@ import com.core.xmpp.listener.OnCompleteListener;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.uas.appcontact.ui.activity.ChatActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 import com.xzjmyk.pm.activity.R;

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

@@ -58,7 +58,7 @@ import com.core.xmpp.widget.ChatContentView;
 import com.core.xmpp.widget.PullDownListView;
 import com.ipaulpro.afilechooser.FileUtils;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendBaiDuLocate;

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

@@ -48,7 +48,7 @@ import com.core.app.Constants;
 import com.core.xmpp.dao.ChatMessageDao;
 import com.core.xmpp.dao.FriendDao;
 import com.core.base.BaseActivity;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.core.dao.DBManager;
 import com.core.model.HrorgsEntity;
 import com.core.net.http.ViewUtil;

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

@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.handmark.pulltorefresh.library.PullToRefreshListView
+        <com.core.widget.stickylistheaders.StickyListHeadersListView
             android:id="@+id/pull_refresh_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

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

@@ -20,7 +20,7 @@
             android:textColor="@color/dark_grey"
             android:visibility="gone" />
 
-        <com.xzjmyk.pm.activity.view.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.xzjmyk.pm.activity.view.ChatBottomView
+            <com.core.xmpp.widget.ChatBottomView
                 android:id="@+id/chat_bottom_view"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"

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

@@ -9,7 +9,7 @@
         android:layout_height="match_parent">
 
         <com.core.widget.stickylistheaders.StickyListHeadersListView
-            android:id="@+id/stickyListHeadersListView"
+            android:id="@+id/pull_refresh_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
     </com.yalantis.phoenix.PullToRefreshView>

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

@@ -419,14 +419,14 @@ public class ChatActivity extends ActionBackActivity
      ***************************************/
     @Override
     public void onMyAvatarClick() {
-        Intent intent = new Intent(mContext, BasicInfoActivity.class);
+        Intent intent = new Intent("com.modular.basic.BasicInfoActivity");
         intent.putExtra(AppConstant.EXTRA_USER_ID, mLoginUserId);
         startActivity(intent);
     }
 
     @Override
     public void onFriendAvatarClick(String friendUserId) {
-        Intent intent = new Intent(mContext, BasicInfoActivity.class);
+        Intent intent = new Intent("com.modular.basic.BasicInfoActivity");
         intent.putExtra(AppConstant.EXTRA_USER_ID, friendUserId);
         startActivity(intent);
     }
@@ -983,7 +983,7 @@ public class ChatActivity extends ActionBackActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.room_info) {
-            Intent intent = new Intent(this, BasicInfoActivity.class);
+            Intent intent = new Intent("com.modular.basic.BasicInfoActivity");
             intent.putExtra(AppConstant.EXTRA_USER_ID, mFriend.getUserId());
             startActivity(intent);
             return true;

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

@@ -414,6 +414,7 @@ public class CompanyContactsActivity extends BaseActivity {
         setResult(101/*MainActivity.UPDATA_LIST*/);
         manager.closeDB();
     }
+
     private void initView() {
         listview = (CustomerListView) findViewById(R.id.lv_saff_list);
         mlistleft = (CustomerListView) findViewById(R.id.lv_left_list);
@@ -617,7 +618,7 @@ public class CompanyContactsActivity extends BaseActivity {
         friend.setCompanyId(0);
         friend.setRoomFlag(0);// 0朋友 1群组
         friend.setStatus(Friend.STATUS_UNKNOW);
-        Intent intent = new Intent(ct, BasicInfoActivity.class);
+        Intent 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());
@@ -886,7 +887,7 @@ public class CompanyContactsActivity extends BaseActivity {
                     friend.setDepart(depart);
                     friend.setPosition(pos);
                     friend.setUserId(imId);
-                    Intent intent = new Intent(ct, BasicInfoActivity.class);
+                    Intent 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());

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

@@ -165,7 +165,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                     if (viewHolder.model.getType() == 3) {
                         return;
                     }
-                    Intent intent = new Intent(mContext, BasicInfoActivity.class);
+                    Intent intent = new Intent("com.modular.basic.BasicInfoActivity");
                     intent.putExtra(AppConstant.EXTRA_NICK_CODE, viewHolder.sub_tv.getText().toString());
                     intent.putExtra(AppConstant.EXTRA_USER_ID, viewHolder.model.getImid());
                     intent.putExtra(AppConstant.EXTRA_NICK_NAME, viewHolder.name_tv.getText().toString());

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

@@ -164,7 +164,7 @@ public class MyFriendActivity extends BaseActivity {
                     intent.putExtra(ChatActivity.FRIEND, friend);
 
                 } else {
-                    intent = new Intent(MyFriendActivity.this, BasicInfoActivity.class);
+                    intent = new Intent("com.modular.basic.BasicInfoActivity");
                     intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
                     intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());
                     intent.putExtra("friend", friend);

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

@@ -112,7 +112,7 @@ public class NewFriendActivity extends BaseActivity implements NewFriendListener
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 NewFriendMessage newFriend = mNewFriends.get((int) id);
-                Intent intent = new Intent(NewFriendActivity.this, BasicInfoActivity.class);
+                Intent intent = new Intent("com.modular.basic.BasicInfoActivity");
                 intent.putExtra(AppConstant.EXTRA_USER_ID, newFriend.getUserId());
                 startActivity(intent);
             }

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

@@ -89,7 +89,7 @@ public class UserListActivity extends BaseActivity {
         mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Intent intent = new Intent(mContext, BasicInfoActivity.class);
+                Intent intent = new Intent("com.modular.basic.BasicInfoActivity");
                 intent.putExtra(AppConstant.EXTRA_USER_ID, mUsers.get((int) id).getUserId());
                 startActivity(intent);
             }

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

@@ -10,7 +10,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.Editable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -53,7 +52,6 @@ import com.core.xmpp.utils.AppConstant;
 import com.uas.appcontact.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.uas.appcontact.listener.ImStatusListener;
-import com.uas.appcontact.ui.activity.BasicInfoActivity;
 import com.uas.appcontact.ui.activity.ChatActivity;
 import com.uas.appcontact.ui.activity.CommonFragmentActivity;
 import com.uas.appcontact.ui.activity.CompanyContactsActivity;
@@ -128,7 +126,6 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.i("gongpengming", "onDestroy");
         LocalBroadcastManager.getInstance(ct).unregisterReceiver(receiver);
     }
 
@@ -276,9 +273,8 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     private void initView() {
         sidebar = (SideBar) findViewById(R.id.sidebar);
         text_dialog = (TextView) findViewById(R.id.text_dialog);
-        refreshListView = (StickyListHeadersListView) findViewById(R.id.stickyListHeadersListView);
         mPullToRefreshView = (PullToRefreshView) findViewById(R.id.contact_ptrv);
-
+        refreshListView = (StickyListHeadersListView) findViewById(R.id.pull_refresh_list);
         showDatas = new ArrayList<>();
         allDatas = new ArrayList<>();
         mcProgressDialog = CustomProgressDialog.createDialog(ct);
@@ -322,7 +318,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
             intent = new Intent(getActivity(), ChatActivity.class);
             intent.putExtra(ChatActivity.FRIEND, friend);
         } else {
-            intent = new Intent(getActivity(), BasicInfoActivity.class);
+            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());