fix ui

xhp · xhp · commit b016d7e02699 · 2017-09-01T12:02:16.000+08:00
diff --git a/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/TeamMemberAitHelper.java b/android/chatinput/src/main/java/cn/jiguang/imui/chatinput/TeamMemberAitHelper.java
@@ -0,0 +1,78 @@
+package cn.jiguang.imui.chatinput;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.ImageSpan;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by hzchenkang on 2016/12/5.
+ */
+
+public class TeamMemberAitHelper {
+
+    private static final String KEY_AIT = "ait";
+
+    public static String getAitAlertString(String content) {
+        return "[有人@你] " + content;
+    }
+
+    public static void replaceAitForeground(String value, SpannableString mSpannableString) {
+        if (TextUtils.isEmpty(value) || TextUtils.isEmpty(mSpannableString)) {
+            return;
+        }
+        Pattern pattern = Pattern.compile("(\\[有人@你\\])");
+        Matcher matcher = pattern.matcher(value);
+        while (matcher.find()) {
+            int start = matcher.start();
+            if (start != 0) {
+                continue;
+            }
+            int end = matcher.end();
+            mSpannableString.setSpan(new ForegroundColorSpan(Color.RED), start, end, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        }
+    }
+
+    private static boolean isContentAit(String content, String account) {
+        if (TextUtils.isEmpty(content)) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("(@" + account + " )");
+        Matcher matcher = pattern.matcher(content);
+        return matcher.find();
+    }
+
+    public static ImageSpan getInputAitSpan(Context context, String name, float textsize, int editTextSize) {
+        if (TextUtils.isEmpty(name)) {
+            return null;
+        }
+        Paint paint = new Paint();
+        paint.setColor(Color.BLACK);
+        paint.setAntiAlias(true);
+        paint.setTextSize(textsize);
+        Rect rect = new Rect();
+
+        paint.getTextBounds(name, 0, name.length(), rect);
+
+        // 获取字符串在屏幕上的长度
+        int width = (int) (paint.measureText(name));
+
+        final Bitmap bmp = Bitmap.createBitmap(width, rect.height(),
+                Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bmp);
+
+        canvas.drawText(name, rect.left, rect.height() - rect.bottom, paint);
+
+        return new ImageSpan(context, bmp, ImageSpan.ALIGN_BOTTOM);
+    }
+}
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AvatarViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/AvatarViewHolder.java
@@ -144,6 +144,7 @@ public void applyStyle(MessageListStyle style) {
         }
         if(mDateTv!=null){
             mDateTv.setTextColor(Color.WHITE);
+            mDateTv.setTextSize(12);
         }
         if (!mIsSender) {
             if (mDisplayNameTv.getVisibility() == View.VISIBLE) {
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CustonViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CustonViewHolder.java
@@ -57,6 +57,7 @@ public boolean onLongClick(View view) {
 
     @Override
     public void applyStyle(MessageListStyle style) {
+        super.applyStyle(style);
         mMsgTv.setMaxWidth((int) (style.getWindowWidth() * style.getBubbleMaxWidth()));
         mMsgTv.setTextSize(17);
         mMsgTv.setLinkTextColor(Color.rgb(173,0,151));
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/NotificationViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/NotificationViewHolder.java
@@ -33,7 +33,7 @@ public void onBind(MESSAGE message) {
     public void applyStyle(MessageListStyle style) {
 
         mEvent.setTextColor(Color.WHITE);
-        mEvent.setTextSize(style.getEventTextSize());
+        mEvent.setTextSize(12);
         mEvent.setPadding(style.getEventPadding(), style.getEventPadding(), style.getEventPadding(), style.getEventPadding());
     }
 }
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
@@ -57,6 +57,7 @@ public boolean onLongClick(View view) {
 
     @Override
     public void applyStyle(MessageListStyle style) {
+        super.applyStyle(style);
         if (mIsSender) {
             mPhotoIv.setBackground(style.getSendPhotoMsgBg());
         } else {
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
@@ -65,6 +65,8 @@ public void onBind(MESSAGE message) {
     @Override
     public void applyStyle(MessageListStyle style) {
 
+        mTextView.setTextColor(Color.WHITE);
+        mTextView.setTextSize(12);
     }
 
     class ClickAble extends ClickableSpan implements View.OnClickListener {
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
@@ -70,6 +70,7 @@ public boolean onLongClick(View view) {
 
     @Override
     public void applyStyle(MessageListStyle style) {
+        super.applyStyle(style);
         mMsgTv.setMaxWidth((int) (style.getWindowWidth() * style.getBubbleMaxWidth()));
         mMsgTv.setTextSize(17);
         mMsgTv.setLinkTextColor(Color.rgb(173,0,151));
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VideoViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/VideoViewHolder.java
@@ -59,5 +59,6 @@ public boolean onLongClick(View view) {
 
     @Override
     public void applyStyle(MessageListStyle style) {
+        super.applyStyle(style);
     }
 }
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
@@ -202,8 +202,7 @@ private void pauseVoice() {
 
     @Override
     public void applyStyle(MessageListStyle style) {
-        mDateTv.setTextSize(style.getDateTextSize());
-        mDateTv.setTextColor(style.getDateTextColor());
+        super.applyStyle(style);
         mSendDrawable = style.getSendVoiceDrawable();
         mReceiveDrawable = style.getReceiveVoiceDrawable();
         mPlaySendAnim = style.getPlaySendVoiceAnim();
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/utils/TimeUtil.java b/android/messagelist/src/main/java/cn/jiguang/imui/utils/TimeUtil.java
@@ -1,5 +1,7 @@
 package cn.jiguang.imui.utils;
 
+import android.text.TextUtils;
+
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -141,7 +143,7 @@ public static String getTimeShowString(long milliseconds, boolean abbreviate) {
         Date preyesterday = new Date(yesterdaybegin.getTime() - 3600 * 24 * 1000);
 
         if (!currentTime.before(todaybegin)) {
-            dataString = "今天";
+            dataString = "";
         } else if (!currentTime.before(yesterdaybegin)) {
             dataString = "昨天";
         } else if (!currentTime.before(preyesterday)) {
@@ -163,7 +165,7 @@ public static String getTimeShowString(long milliseconds, boolean abbreviate) {
                 return dataString;
             }
         } else {
-            return dataString + " " + timeStringBy24;
+            return TextUtils.isEmpty(dataString) ? timeStringBy24 : dataString + " " + timeStringBy24;
         }
     }
 
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
@@ -4,10 +4,11 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="horizontal"
-    android:padding="5dp">
+    android:padding="8dp">
 
     <LinearLayout
         android:gravity="center"
+        android:padding="2dp"
         android:background="@drawable/aurora_bg_event_message"
         android:orientation="horizontal"
         android:layout_width="wrap_content"
diff --git a/android/messagelist/src/main/res/values/styles.xml b/android/messagelist/src/main/res/values/styles.xml
@@ -27,6 +27,8 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingRight">4dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">4dp</item>
         <item name="android:background">@drawable/nim_bg_message_tip</item>
         <item name="android:paddingTop">2dp</item>
         <item name="android:paddingBottom">2dp</item>
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/AuroraIMUIModule.java b/android/src/main/java/cn/jiguang/imui/messagelist/AuroraIMUIModule.java
@@ -11,8 +11,10 @@
 import com.facebook.react.uimanager.UIImplementation;
 import com.facebook.react.uimanager.UIManagerModule;
 
+import cn.jiguang.imui.messagelist.module.RCTChatInput;
 import cn.jiguang.imui.messagelist.module.RCTMessage;
 
+import static cn.jiguang.imui.messagelist.MessageUtil.configChatInput;
 import static cn.jiguang.imui.messagelist.MessageUtil.configMessage;
 
 
@@ -104,5 +106,18 @@ public void scrollToBottom() {
         getReactApplicationContext().sendBroadcast(intent);
     }
 
+    @ReactMethod
+    public void getAitMemberList(ReadableArray members){
+        String[] rctMembers = new String[members.size()];
+        for (int i = 0; i < members.size(); i++) {
+
+            RCTChatInput chatInput = configChatInput(members.getMap(i));
+            rctMembers[i] = chatInput.toString();
+        }
+        Intent intent = new Intent();
+        intent.setAction(ReactChatInputManager.RCT_AIT_MEMBERS_ACTION);
+        intent.putExtra(ReactChatInputManager.RCT_DATA, rctMembers);
+        getReactApplicationContext().sendBroadcast(intent);
+    }
 
 }
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/MessageUtil.java b/android/src/main/java/cn/jiguang/imui/messagelist/MessageUtil.java
@@ -10,6 +10,7 @@
 
 import cn.jiguang.imui.messagelist.module.RCTAccountNotice;
 import cn.jiguang.imui.messagelist.module.RCTBankTransfer;
+import cn.jiguang.imui.messagelist.module.RCTChatInput;
 import cn.jiguang.imui.messagelist.module.RCTExtend;
 import cn.jiguang.imui.messagelist.module.RCTLink;
 import cn.jiguang.imui.messagelist.module.RCTLocation;
@@ -168,4 +169,10 @@ public static RCTMessage configMessage(ReadableMap message) {
 //        }
         return rctMsg;
     }
+
+    public static RCTChatInput configChatInput(ReadableMap chatInput){
+        RCTChatInput input = new RCTChatInput();
+
+        return input;
+    }
 }
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/RCTChatInputDeserialize.java b/android/src/main/java/cn/jiguang/imui/messagelist/RCTChatInputDeserialize.java
@@ -0,0 +1,22 @@
+package cn.jiguang.imui.messagelist;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+
+import cn.jiguang.imui.messagelist.module.RCTChatInput;
+
+/**
+ * Created by dowin on 2017/9/1.
+ */
+
+public class RCTChatInputDeserialize implements JsonDeserializer<RCTChatInput> {
+    @Override
+    public RCTChatInput deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        RCTChatInput input = new RCTChatInput();
+        return input;
+    }
+}
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java b/android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java
@@ -3,23 +3,32 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.util.Log;
 import android.view.View;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.util.Map;
 
 import cn.jiguang.imui.chatinput.ChatInputView;
 import cn.jiguang.imui.chatinput.listener.OnClickEditTextListener;
 import cn.jiguang.imui.chatinput.listener.OnMenuClickListener;
 import cn.jiguang.imui.chatinput.listener.RecordVoiceListener;
+import cn.jiguang.imui.messagelist.module.RCTMessage;
+import cn.jiguang.imui.utils.SessorUtil;
 
 
 public class ReactChatInputManager extends ViewGroupManager<ChatInputView> {
@@ -39,6 +48,12 @@ public class ReactChatInputManager extends ViewGroupManager<ChatInputView> {
     private static final String ON_EDIT_TEXT_CHANGE_EVENT = "onEditTextChange";
     private final int REQUEST_PERMISSION = 0x0001;
 
+    public static final String RCT_DATA = "members";
+    public static final String RCT_AIT_MEMBERS_ACTION = "cn.jiguang.imui.chatinput.intent.aitMembers";
+
+
+    private ReactContext mContext;
+
     @Override
     public String getName() {
         return REACT_CHAT_INPUT;
@@ -59,6 +74,14 @@ public void onCatalystInstanceDestroy() {
     @Override
     protected ChatInputView createViewInstance(final ThemedReactContext reactContext) {
         Log.w(TAG, "createViewInstance");
+
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(RCT_AIT_MEMBERS_ACTION);
+
+        mContext = reactContext;
+        SessorUtil.getInstance(reactContext).register(true);
+        mContext.registerReceiver(RCTMsgListReceiver, intentFilter);
+
         final Activity activity = reactContext.getCurrentActivity();
         final ChatInputView chatInput = new ChatInputView(activity, null);
         chatInput.setMenuContainerHeight(666);
@@ -206,4 +229,13 @@ public void addView(ChatInputView parent, View child, int index) {
         Log.w(TAG, "name:" + child.getClass().getName());
         Log.w(TAG, "index:" + index);
     }
+
+    private BroadcastReceiver RCTMsgListReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Activity activity = mContext.getCurrentActivity();
+            Gson gson = new GsonBuilder().registerTypeAdapter(RCTMessage.class, new RCTChatInputDeserialize())
+                    .create();
+        }
+    };
 }
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java b/android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java
@@ -4,7 +4,6 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -233,8 +232,8 @@ void showMenu(final ReactContext reactContext, final RCTMessage message) {
             dialog.addItem("复制", new CustomAlertDialog.onSeparateItemClickListener() {
                 @Override
                 public void onClick() {
-                    ClipboardManager cm = (ClipboardManager) reactContext.getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setText(message.getText());
+//                    ClipboardManager cm = (ClipboardManager) reactContext.getSystemService(Context.CLIPBOARD_SERVICE);
+//                    cm.setText(message.getText());
                     WritableMap event = Arguments.createMap();
                     event.putMap("message", message.toWritableMap());
                     event.putString("opt", "copy");
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/module/RCTChatInput.java b/android/src/main/java/cn/jiguang/imui/messagelist/module/RCTChatInput.java
@@ -0,0 +1,8 @@
+package cn.jiguang.imui.messagelist.module;
+
+/**
+ * Created by dowin on 2017/9/1.
+ */
+
+public class RCTChatInput {
+}

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ public void applyStyle(MessageListStyle style) {`
`144`	`144`	`}`
`145`	`145`	`if(mDateTv!=null){`
`146`	`146`	`mDateTv.setTextColor(Color.WHITE);`
	`147`	`+ mDateTv.setTextSize(12);`
`147`	`148`	`}`
`148`	`149`	`if (!mIsSender) {`
`149`	`150`	`if (mDisplayNameTv.getVisibility() == View.VISIBLE) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void onBind(MESSAGE message) {`
`33`	`33`	`public void applyStyle(MessageListStyle style) {`
`34`	`34`
`35`	`35`	`mEvent.setTextColor(Color.WHITE);`
`36`		`- mEvent.setTextSize(style.getEventTextSize());`
	`36`	`+ mEvent.setTextSize(12);`
`37`	`37`	`mEvent.setPadding(style.getEventPadding(), style.getEventPadding(), style.getEventPadding(), style.getEventPadding());`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ public void onBind(MESSAGE message) {`
`65`	`65`	`@Override`
`66`	`66`	`public void applyStyle(MessageListStyle style) {`
`67`	`67`
	`68`	`+ mTextView.setTextColor(Color.WHITE);`
	`69`	`+ mTextView.setTextSize(12);`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`class ClickAble extends ClickableSpan implements View.OnClickListener {`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,6 @@ public boolean onLongClick(View view) {`
`59`	`59`
`60`	`60`	`@Override`
`61`	`61`	`public void applyStyle(MessageListStyle style) {`
	`62`	`+ super.applyStyle(style);`
`62`	`63`	`}`
`63`	`64`	`}`