验证分享成功

app/src/main/java/com/xplora/xpchat/activity/MemberShareActivity.java

@@ -2,8 +2,10 @@ package com.xplora.xpchat.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.Window;
 import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -34,6 +36,7 @@ public class MemberShareActivity extends BaseActivity {
     @Override
     protected void onCreateBase() {
         super.onCreateBase();
+        getWindow().requestFeature(Window.FEATURE_SWIPE_TO_DISMISS);
         setContentView(R.layout.activity_itemlist_share);
     }
 
@@ -75,7 +78,8 @@ public class MemberShareActivity extends BaseActivity {
                 GridModel model = mDataList.get(i);
                 model.isSelected = i == itemIndex;
                 if (i == itemIndex) {
-                    mShareContactBean = (ContactBean) model.bean;
+                    mShareContactBean = (ContactBean)model.bean;
+                    Log.d(TAG, "onClick: " + mShareContactBean.userId);
                 }
             }
 

app/src/main/java/com/xplora/xpchat/activity/MembersActivity.java

@@ -2,6 +2,7 @@ package com.xplora.xpchat.activity;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.view.Window;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -23,6 +24,7 @@ public class MembersActivity extends BaseActivity {
     @Override
     protected void onCreateBase() {
         super.onCreateBase();
+        getWindow().requestFeature(Window.FEATURE_SWIPE_TO_DISMISS);
         setContentView(R.layout.activity_itemlist);
     }
 

app/src/main/java/com/xplora/xpchat/activity/PagerActivity.java

@@ -542,6 +542,8 @@ public class PagerActivity extends BaseActivity implements Listener.PlayListener
 
     @Override
     public void onItemClick(int position) {
+        if (position >= DataManager.instance().getMessagesList().size())
+            return;
         MessageBean bean = DataManager.instance().getMessagesList().get(position);
         Log.d(TAG, "onItemClick position:" + position + " bean:" + bean.beanToString());
 
@@ -906,32 +908,37 @@ public class PagerActivity extends BaseActivity implements Listener.PlayListener
 
     @Override
     public void onShareFile(int position, MessageBean bean) {
-        mShareMemberBean = DataManager.createSendMessageBean(mChatType, mChatUserId, bean.type, 0, bean.filePath, "", "", bean.videoPath, "");;
+        mShareMemberBean = bean;
         Intent intent = new Intent(this, MemberShareActivity.class);
         startActivityForResult(intent, Constant.REQUEST_CODE_SHARE);
     }
 
     public void onShareFileCallback(Intent intent) {
-        if (mShareMemberBean == null)
-            return;
-
+        Log.d(TAG, "onShareFileCallback: ");
         //关闭弹框
         if (mActionFragment != null) {
             mActionFragment.dismissAllowingStateLoss();
             mActionFragment = null;
         }
 
+        if (mShareMemberBean == null)
+            return;
+
         //重新配置联系人信息
         mChatType = intent.getIntExtra(Constant.EXTRA_CHAT_TYPE, 0);
         mChatId = intent.getLongExtra(Constant.EXTRA_CHAT_ID, 0);
         mChatUserId = intent.getStringExtra(Constant.EXTRA_CHAT_USER_ID);
+        Log.d(TAG, "onShareFileCallback: mChatType:" + mChatType + " mChatUserId:" + mChatUserId);
+
+        MessageBean bean = DataManager.createSendMessageBean(mChatType, mChatUserId, mShareMemberBean.type, 0, mShareMemberBean.filePath, "", "", mShareMemberBean.videoPath, "");
+        mShareMemberBean = null;
 
         //拉取新联系人聊天信息
         DataManager.instance().clearMessageList();
         loadFromMessageDB();
 
         //分享信息
-        sendMessage(mShareMemberBean, 10);
+        sendMessage(bean, 40);
 
         //通知拉取当前联系人最新消息
         checkLastMessage();