提交备份保存

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

@@ -43,7 +43,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.uas.appcontact.ui.activity.ChatActivity;
+import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 import com.xzjmyk.pm.activity.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;

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

@@ -71,7 +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 com.xzjmyk.pm.activity.ui.message.ChatActivity;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -59,7 +59,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.FriendHelper;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-import com.uas.appcontact.ui.activity.ChatActivity;
+import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.core.utils.ToastUtil;
 import com.core.widget.DataLoadView;

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

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

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

@@ -36,7 +36,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MsgsSecondCommonActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.MessageModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMessageView;
-import com.uas.appcontact.ui.activity.ChatActivity;
+import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 import com.core.utils.TimeUtils;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ChatActivity.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -1,4 +1,4 @@
-package com.uas.appcontact.ui.activity;
+package com.xzjmyk.pm.activity.ui.message;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;

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

@@ -16,7 +16,6 @@ import android.widget.TextView;
 
 import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
-import com.uas.appcontact.ui.activity.ChatActivity;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.core.xmpp.model.ChatMessage;

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

@@ -23,7 +23,6 @@ import com.core.xmpp.model.ChatMessage;
 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.ChatActivity;
 import com.xzjmyk.pm.activity.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.xzjmyk.pm.activity.sortlist.BaseComparator;

app_modular/appcontact/src/main/AndroidManifest.xml

@@ -1,9 +1,33 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
           package="com.uas.appcontact">
 
-    <application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true">
-
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+        <activity android:name="com.uas.appcontact.ui.activity.NewFriendActivity" />
+        <activity
+            android:name="com.uas.appcontact.ui.activity.MyFriendActivity"
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+        <activity
+            android:name="com.uas.appcontact.ui.activity.ContactsActivity"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name="com.uas.appcontact.ui.activity.CompanyContactsActivity"
+            android:windowSoftInputMode="stateVisible|adjustResize" />
+        <activity android:name="com.uas.appcontact.ui.activity.CommonFragmentActivity" />
+        <!-- 附近模块 -->
+        <activity
+            android:name="com.uas.appcontact.ui.activity.UserSearchActivity"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+        <activity android:name="com.uas.appcontact.ui.activity.UserListActivity" />
+        <activity
+            android:name="com.uas.appcontact.ui.activity.SelectDateActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.uas.appcontact.ui.activity.PlatContactAddPeopleActivity"
+            android:label="@string/add_new_people"
+            android:windowSoftInputMode="adjustPan" />
     </application>
 
 </manifest>

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

@@ -641,8 +641,8 @@ public class CompanyContactsActivity extends BaseActivity {
         if (friendOne == null) {
             FriendDao.getInstance().createOrUpdateFriend(friend);
         }
-        Intent intent = new Intent(CompanyContactsActivity.this, ChatActivity.class);
-        intent.putExtra(ChatActivity.FRIEND, friend);
+        Intent intent = new Intent("com.modular.message.ChatActivity" );
+        intent.putExtra("friend", friend);
         startActivity(intent);
     }
 

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

@@ -160,8 +160,8 @@ public class MyFriendActivity extends BaseActivity {
                 if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友消息
                     intent = new Intent(MyFriendActivity.this, NewFriendActivity.class);
                 } else if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {// 新朋友消息
-                    intent = new Intent(MyFriendActivity.this, ChatActivity.class);
-                    intent.putExtra(ChatActivity.FRIEND, friend);
+                    intent = new Intent("com.modular.message.ChatActivity");
+                    intent.putExtra("friend", friend);
 
                 } else {
                     intent = new Intent("com.modular.basic.BasicInfoActivity");

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

@@ -52,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.ChatActivity;
 import com.uas.appcontact.ui.activity.CommonFragmentActivity;
 import com.uas.appcontact.ui.activity.CompanyContactsActivity;
 import com.uas.appcontact.ui.activity.ContactsActivity;
@@ -315,8 +314,8 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         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("friend", friend);
         } else {
             intent = new Intent("com.modular.basic.BasicInfoActivity");
             intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());