Merge branch 'master' of https://github.com/reactnativecomponent/react-native-imui

guangyao · guangyao · commit 66c648837d8f · 2017-09-27T17:39:35.000+08:00
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/MsgListAdapter.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/MsgListAdapter.java
@@ -526,11 +526,10 @@ public void updateMessage(String oldId, MESSAGE newMessage) {
     /**
      * Delete message.
      *
-     * @param message message to be deleted.
+     * @param messageId message to be deleted.
      */
-    public void delete(MESSAGE message) {
-        deleteById(message.getMsgId());
-        deleteImage(message);
+    public void delete(String messageId) {
+        deleteById(messageId);
     }
 
     /**
@@ -541,6 +540,11 @@ public void delete(MESSAGE message) {
     public void deleteById(String id) {
         int index = getMessagePositionById(id);
         if (index >= 0) {
+            Wrapper wrapper = mItems.get(index);
+            if (wrapper.item instanceof IMessage) {
+                MESSAGE message = (MESSAGE) wrapper.item;
+                deleteImage(message);
+            }
             mItems.remove(index);
             notifyItemRemoved(index);
         }
@@ -1274,16 +1278,16 @@ public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
         ViewHolderController.getInstance().release();
     }
 
-    public void pausePlayVoice() {
+    public void releasePlayVoice() {
         if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
             mMediaPlayer.pause();
         }
     }
 
     public void stopPlayVoice() {
+        Log.w(getClass().getName(), "stopPlayVoice");
         if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
             mMediaPlayer.stop();
-            mMediaPlayer.release();
         }
 
     }
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/PhotoViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/PhotoViewHolder.java
@@ -11,6 +11,7 @@
 import cn.jiguang.imui.commons.models.IMediaFile;
 import cn.jiguang.imui.commons.models.IMessage;
 import cn.jiguang.imui.messages.MessageListStyle;
+import cn.jiguang.imui.utils.DisplayUtil;
 
 public class PhotoViewHolder<MESSAGE extends IMessage> extends AvatarViewHolder<MESSAGE> {
 
@@ -60,6 +61,8 @@ public boolean onLongClick(View view) {
     public void applyStyle(MessageListStyle style) {
         super.applyStyle(style);
 
+        mPhotoIv.setMinimumWidth(DisplayUtil.dp2px(style.mContext,100));
+        mPhotoIv.setMinimumHeight(DisplayUtil.dp2px(style.mContext,100));
         mPhotoIv.setScaleType(ImageView.ScaleType.FIT_END);
 //        if (mIsSender) {
 //            mPhotoIv.setBackground(style.getSendPhotoMsgBg());
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.java
@@ -7,7 +7,6 @@
 import android.text.TextPaint;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
-import android.text.style.ImageSpan;
 import android.view.View;
 import android.widget.TextView;
 
@@ -30,7 +29,6 @@ public class RedPacketOpenViewHolder<MESSAGE extends IMessage>
 
     private TextView mTextView;
     final static Pattern pattern = Pattern.compile("红包{1}");
-    private ImageSpan imageSpan;
 
     public RedPacketOpenViewHolder(RecyclerView.Adapter adapter, View itemView, boolean isSender) {
         super(adapter, itemView);
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TipViewHoler.java
@@ -2,6 +2,11 @@
 
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.view.View;
 import android.widget.TextView;
 
@@ -19,15 +24,28 @@ public class TipViewHoler<MESSAGE extends IMessage>
         implements MsgListAdapter.DefaultMessageViewHolder {
 
     private TextView mEvent;
+    final static String SEND_FRIEND = "发送朋友验证";
 
     public TipViewHoler(RecyclerView.Adapter adapter, View itemView, boolean isSender) {
         super(adapter, itemView);
         mEvent = (TextView) itemView.findViewById(R.id.aurora_tv_msgitem_event);
+        mEvent.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
     @Override
     public void onBind(MESSAGE message) {
-        mEvent.setText(message.getText());
+        final String mText = message.getText();
+
+        final int fIndex = mText.lastIndexOf(SEND_FRIEND);
+        if (fIndex != -1) {
+            SpannableString spann = new SpannableString(message.getText());
+            spann.setSpan(new TipViewHoler.ClickAble(message), fIndex, fIndex + SEND_FRIEND.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            mEvent.setText(spann);
+        }else {
+
+            mEvent.setText(mText);
+        }
+
     }
 
     @Override
@@ -37,5 +55,26 @@ public void applyStyle(MessageListStyle style) {
         mEvent.setTextSize(12);
         mEvent.setPadding(style.getEventPadding(), style.getEventPadding(), style.getEventPadding(), style.getEventPadding());
     }
+
+    class ClickAble extends ClickableSpan implements View.OnClickListener {
+        MESSAGE message;
+
+        public ClickAble(MESSAGE message) {
+            this.message = message;
+        }
+
+        @Override
+        public void onClick(View widget) {
+            if (mMsgClickListener != null) {
+                mMsgClickListener.onMessageClick(message);
+            }
+        }
+
+        @Override
+        public void updateDrawState(TextPaint ds) {
+            ds.setColor(Color.parseColor("#0000ff"));
+            ds.setUnderlineText(false);
+        }
+    }
 }
 
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TxtViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/TxtViewHolder.java
@@ -77,7 +77,7 @@ public boolean onLongClick(View view) {
     public void applyStyle(MessageListStyle style) {
         super.applyStyle(style);
         mMsgTv.setMaxWidth((int) (style.getWindowWidth() * style.getBubbleMaxWidth()));
-        mMsgTv.setTextSize(22);
+        mMsgTv.setTextSize(18);
         mMsgTv.setTextColor(mIsSender ? Color.WHITE : Color.BLACK);
         mMsgTv.setLinkTextColor(mIsSender ? Color.parseColor("#bbdcff") : Color.parseColor("#238dfa"));
 
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VoiceViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VoiceViewHolder.java
@@ -110,7 +110,7 @@ public void onClick(View view) {
                 mVoiceAnimation = (AnimationDrawable) mVoiceIv.getDrawable();
                 mController.addView(getAdapterPosition(), mVoiceIv);
                 // If audio is playing, pause
-                Log.e("VoiceViewHolder", "MediaPlayer playing " + mMediaPlayer.isPlaying() + "now position " + getAdapterPosition());
+//                Log.e("VoiceViewHolder", "MediaPlayer playing " + mMediaPlayer.isPlaying() + "now position " + getAdapterPosition());
                 if (mController.getLastPlayPosition() == getAdapterPosition()) {
                     if (mMediaPlayer.isPlaying()) {
                         pauseVoice();
@@ -209,10 +209,11 @@ public void applyStyle(MessageListStyle style) {
         mReceiveDrawable = style.getReceiveVoiceDrawable();
         mPlaySendAnim = style.getPlaySendVoiceAnim();
         mPlayReceiveAnim = style.getPlayReceiveVoiceAnim();
+        final int padding = 8;
         if (mIsSender) {
             mVoiceIv.setImageResource(mSendDrawable);
             mMsgTv.setBackground(style.getSendBubbleDrawable());
-            mMsgTv.setPadding(0,DisplayUtil.dp2px(style.mContext,12),DisplayUtil.dp2px(style.mContext,3),DisplayUtil.dp2px(style.mContext,12));
+            mMsgTv.setPadding(0,DisplayUtil.dp2px(style.mContext,padding),DisplayUtil.dp2px(style.mContext,3),DisplayUtil.dp2px(style.mContext,padding));
             if (style.getSendingProgressDrawable() != null) {
                 mSendingPb.setProgressDrawable(style.getSendingProgressDrawable());
             }
@@ -222,7 +223,7 @@ public void applyStyle(MessageListStyle style) {
         } else {
             mVoiceIv.setImageResource(mReceiveDrawable);
             mMsgTv.setBackground(style.getReceiveBubbleDrawable());
-            mMsgTv.setPadding(DisplayUtil.dp2px(style.mContext,3),DisplayUtil.dp2px(style.mContext,12),0,DisplayUtil.dp2px(style.mContext,12));
+            mMsgTv.setPadding(DisplayUtil.dp2px(style.mContext,3),DisplayUtil.dp2px(style.mContext,padding),0,DisplayUtil.dp2px(style.mContext,padding));
         }
         mLengthTv.setTextColor(Color.rgb(157, 157, 158));
     }
diff --git a/android/messagelist/src/main/res/layout/item_custom_message.xml b/android/messagelist/src/main/res/layout/item_custom_message.xml
@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="0dp"
-            android:gravity="center"
+            android:gravity="left"
             android:paddingLeft="0dp"
             android:text="TextView"
             android:textColor="#ffffff"
diff --git a/android/messagelist/src/main/res/layout/item_event_message.xml b/android/messagelist/src/main/res/layout/item_event_message.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:background="@drawable/aurora_bg_event_message"
-        android:gravity="center"
+        android:gravity="left"
         android:padding="5dp"
         android:textSize="10sp"
         android:text="TextView"
diff --git a/android/messagelist/src/main/res/layout/item_notification_message.xml b/android/messagelist/src/main/res/layout/item_notification_message.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:background="@drawable/aurora_bg_event_message"
-        android:gravity="center"
+        android:gravity="left"
         android:padding="5dp"
         android:textSize="10sp"
         android:text="notification"
diff --git a/android/messagelist/src/main/res/layout/item_red_packet_open_message.xml b/android/messagelist/src/main/res/layout/item_red_packet_open_message.xml
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="0dp"
-            android:gravity="center"
+            android:gravity="left"
             android:paddingLeft="0dp"
             android:text="TextView"
             android:textColor="#ffffff"
diff --git a/android/messagelist/src/main/res/layout/item_tip_message.xml b/android/messagelist/src/main/res/layout/item_tip_message.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:background="@drawable/aurora_bg_event_message"
-        android:gravity="center"
+        android:gravity="left"
         android:padding="5dp"
         android:textSize="10sp"
         android:text="TextView"
diff --git a/android/popuptool/src/main/java/com/popup/tool/PopupUtil.java b/android/popuptool/src/main/java/com/popup/tool/PopupUtil.java
@@ -38,7 +38,7 @@ public static void show(View anchor, Context context) {
 
     public static void showDialog(Context context, String title, final List<String> action, final AdapterView.OnItemClickListener itemClickListener) {
         final AlertDialog dialog = new AlertDialog.Builder(context).create();
-        View view = LayoutInflater.from(context).inflate(R.layout.action, null);
+        View view = LayoutInflater.from(context).inflate(R.layout.menu, null);
 
         int length = 0;
         if (action != null && action.size() > 0) {
@@ -70,12 +70,15 @@ public void onClick(View v) {
         dialog.show();
         int width = dialog.getWindow().getWindowManager().getDefaultDisplay().getWidth();
         WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
-        params.width = width-(width/6);
-        params.height =  WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.CENTER;
+        params.width = width;
+        params.x = 0;
+        params.y = 0;
+        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        params.gravity = Gravity.LEFT | Gravity.BOTTOM;
         dialog.getWindow().setAttributes(params);
     }
-    public static void showAction(Context context,View top, String title, final List<String> action, final AdapterView.OnItemClickListener itemClickListener) {
+
+    public static void showAction(Context context, View top, String title, final List<String> action, final AdapterView.OnItemClickListener itemClickListener) {
         View view = LayoutInflater.from(context).inflate(R.layout.action, null);
         final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
 
diff --git a/android/popuptool/src/main/res/layout/menu.xml b/android/popuptool/src/main/res/layout/menu.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/round_bg"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="9dp"
+            android:text="title"
+            android:visibility="gone" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="#000000"
+            android:gravity="center"
+            android:visibility="gone" />
+
+        <ListView
+            android:id="@+id/list_view"
+            android:scrollbars="none"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="150dp">
+
+        </ListView>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/cancel"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/round_bg_selector"
+        android:text="取消" />
+
+</LinearLayout>
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/AuroraIMUIModule.java b/android/src/main/java/cn/jiguang/imui/messagelist/AuroraIMUIModule.java
@@ -2,6 +2,7 @@
 
 
 import android.content.Intent;
+import android.util.Log;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -82,8 +83,11 @@ public void insertMessage(ReadableMap message) {
     public void deleteMessage(ReadableArray messages) {
         String[] rctMessages = new String[messages.size()];
         for (int i = 0; i < messages.size(); i++) {
-            RCTMessage rctMessage = configMessage(messages.getMap(i));
-            rctMessages[i] = rctMessage.toString();
+            ReadableMap item = messages.getMap(i);
+            if (item.hasKey(MessageConstant.Message.MSG_ID)) {
+                String id = item.getString(MessageConstant.Message.MSG_ID);
+                rctMessages[i] = id;
+            }
         }
         Intent intent = new Intent();
         intent.setAction(ReactMsgListManager.RCT_DELETE_MESSAGES_ACTION);
@@ -92,13 +96,15 @@ public void deleteMessage(ReadableArray messages) {
     }
 
     @ReactMethod
-    public void clearMessage(){
+    public void clearMessage() {
         Intent intent = new Intent();
         intent.setAction(ReactMsgListManager.RCT_CLEAR_MESSAGES_ACTION);
         getReactApplicationContext().sendBroadcast(intent);
     }
+
     @ReactMethod
-    public void stopPlayVoice(){
+    public void stopPlayVoice() {
+        Log.w(getClass().getName(), "stopPlayVoice");
         Intent intent = new Intent();
         intent.setAction(ReactMsgListManager.RCT_STOP_PLAY_VOICE_ACTION);
         getReactApplicationContext().sendBroadcast(intent);
@@ -112,7 +118,7 @@ public void scrollToBottom() {
     }
 
     @ReactMethod
-    public void getAitMember(ReadableMap member){
+    public void getAitMember(ReadableMap member) {
 
         RCTMember chatInput = configChatInput(member);
         Intent intent = new Intent();
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/DecodeUtil.java b/android/src/main/java/cn/jiguang/imui/messagelist/DecodeUtil.java
@@ -77,6 +77,6 @@ public static String parseQRcodeBitmap(String bitmapPath) {
             e.printStackTrace();
         }
 
-        return result != null ? result.getText() : "";
+        return result != null ? result.getText() : null;
     }
 }
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java b/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java b/android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java

Original file line number	Diff line number	Diff line change
`@@ -526,11 +526,10 @@ public void updateMessage(String oldId, MESSAGE newMessage) {`
`526`	`526`	`/**`
`527`	`527`	`* Delete message.`
`528`	`528`	`*`
`529`		`- * @param message message to be deleted.`
	`529`	`+ * @param messageId message to be deleted.`
`530`	`530`	`*/`
`531`		`- public void delete(MESSAGE message) {`
`532`		`- deleteById(message.getMsgId());`
`533`		`- deleteImage(message);`
	`531`	`+ public void delete(String messageId) {`
	`532`	`+ deleteById(messageId);`
`534`	`533`	`}`
`535`	`534`
`536`	`535`	`/**`
`@@ -541,6 +540,11 @@ public void delete(MESSAGE message) {`
`541`	`540`	`public void deleteById(String id) {`
`542`	`541`	`int index = getMessagePositionById(id);`
`543`	`542`	`if (index >= 0) {`
	`543`	`+ Wrapper wrapper = mItems.get(index);`
	`544`	`+ if (wrapper.item instanceof IMessage) {`
	`545`	`+ MESSAGE message = (MESSAGE) wrapper.item;`
	`546`	`+ deleteImage(message);`
	`547`	`+ }`
`544`	`548`	`mItems.remove(index);`
`545`	`549`	`notifyItemRemoved(index);`
`546`	`550`	`}`
`@@ -1274,16 +1278,16 @@ public void onDetachedFromRecyclerView(RecyclerView recyclerView) {`
`1274`	`1278`	`ViewHolderController.getInstance().release();`
`1275`	`1279`	`}`
`1276`	`1280`
`1277`		`- public void pausePlayVoice() {`
	`1281`	`+ public void releasePlayVoice() {`
`1278`	`1282`	`if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {`
`1279`	`1283`	`mMediaPlayer.pause();`
`1280`	`1284`	`}`
`1281`	`1285`	`}`
`1282`	`1286`
`1283`	`1287`	`public void stopPlayVoice() {`
	`1288`	`+ Log.w(getClass().getName(), "stopPlayVoice");`
`1284`	`1289`	`if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {`
`1285`	`1290`	`mMediaPlayer.stop();`
`1286`		`- mMediaPlayer.release();`
`1287`	`1291`	`}`
`1288`	`1292`
`1289`	`1293`	`}`