fix ui

Author: xhp

android/chatinput/src/main/java/cn/jiguang/imui/chatinput/record/RecordHelper.java

@@ -26,7 +26,7 @@ public class RecordHelper {
 
     private static final int MIN_INTERVAL_TIME = 1000;// 1s
 
-    private static final int MAX_INTERVAL_TIME = 120;// 1s
+    private static final int MAX_INTERVAL_TIME = 60;// 1s
 
     private MediaRecorder recorder;
     private RecordVoiceListener mListener;

android/messagelist/src/main/java/cn/jiguang/imui/messages/MessageListStyle.java

@@ -143,7 +143,7 @@ public static MessageListStyle parse(Context context, AttributeSet attrs) {
                 R.drawable.aurora_anim_receive_voice);
 
         WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        style.bubbleMaxWidth = typedArray.getFloat(R.styleable.MessageList_bubbleMaxWidth, 0.7f);
+        style.bubbleMaxWidth = typedArray.getFloat(R.styleable.MessageList_bubbleMaxWidth, 0.65f);
         style.windowWidth =  wm.getDefaultDisplay().getWidth();
 
         style.sendPhotoMsgBg = typedArray.getDrawable(R.styleable.MessageList_sendPhotoMsgBg);

android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/BankTransferViewHolder.java

@@ -1,9 +1,12 @@
 package cn.jiguang.imui.messages.viewholder;
 
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import java.text.DecimalFormat;
+
 import cn.jiguang.imui.R;
 import cn.jiguang.imui.commons.models.IBankTransfer;
 import cn.jiguang.imui.commons.models.IMessage;
@@ -17,27 +20,53 @@ public class BankTransferViewHolder<MESSAGE extends IMessage> extends AvatarView
 
     private TextView value;
     private TextView comments;
-
+    private View layoutTop;
 
     public BankTransferViewHolder(RecyclerView.Adapter adapter, View itemView, boolean isSender) {
         super(adapter, itemView, isSender);
         value = (TextView) itemView.findViewById(R.id.bank_transfer_value);
         comments = (TextView) itemView.findViewById(R.id.bank_transfer_comments);
-
+        layoutTop = itemView.findViewById(R.id.layout_top);
     }
 
     @Override
     public void onBind(final MESSAGE message) {
         super.onBind(message);
         IBankTransfer extend = getExtend(message);
         if (extend != null) {
-            value.setText(extend.getAmount());
-            comments.setText(extend.getComments());
+            value.setText(formatAmount(extend.getAmount()));
+            if (TextUtils.isEmpty(extend.getComments())) {
+                comments.setText("飞马转账");
+            } else {
+                comments.setText(extend.getComments());
+            }
+        }
+        layoutTop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mMsgClickListener != null) {
+                    mMsgClickListener.onMessageClick(message);
+                }
+            }
+        });
+    }
+
+    final DecimalFormat format = new DecimalFormat("#.00");
+
+    String formatAmount(String amount) {
+
+        try {
+            return format.format(Integer.valueOf(amount)) + "元";
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return amount + "元";
         }
     }
 
     @Override
     public void applyStyle(MessageListStyle style) {
         super.applyStyle(style);
+//        layout.getLayoutParams().width = (int) (style.getWindowWidth() * 0.65);
+        layoutTop.setBackground(style.getRedPacketTopDrawable());
     }
 }

android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketOpenViewHolder.java

@@ -44,7 +44,7 @@ public void onBind(MESSAGE message) {
 
         IRedPacketOpen extend = getExtend(message);
         if (extend != null) {
-            String mText = "icon" + extend.getTipMsg();
+            String mText = extend.getTipMsg();
             Matcher m = pattern.matcher(mText);
             SpannableString spann = new SpannableString(mText);
 //            if (imageSpan == null) {

android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/RedPacketViewHolder.java

@@ -26,18 +26,26 @@ public RedPacketViewHolder(RecyclerView.Adapter adapter, View itemView, boolean
     }
 
     @Override
-    public void onBind(MESSAGE message) {
+    public void onBind(final MESSAGE message) {
         super.onBind(message);
         IRedPacket extend = getExtend(message);
         if (extend != null) {
             comments.setText(extend.getComments());
         }
-
+        layoutTop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mMsgClickListener != null) {
+                    mMsgClickListener.onMessageClick(message);
+                }
+            }
+        });
     }
 
     @Override
     public void applyStyle(MessageListStyle style) {
         super.applyStyle(style);
+//        layout.getLayoutParams().width = (int) (style.getWindowWidth() * 0.65);
         layoutTop.setBackground(style.getRedPacketTopDrawable());
     }
 }

android/messagelist/src/main/res/drawable-xhdpi/redpacket.png

@@ -34,33 +34,32 @@
             android:orientation="vertical">
 
             <RelativeLayout
+                android:id="@+id/layout_top"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/red_packet_top">
 
                 <ImageView
                     android:id="@+id/icon"
                     android:layout_margin="@dimen/red_packet_image_margin"
-                    android:src="@drawable/icon_packet"
+                    android:src="@drawable/transfer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/bank_transfer_value"
+                    android:id="@+id/bank_transfer_comments"
                     android:layout_toRightOf="@+id/icon"
                     android:layout_marginTop="@dimen/red_packet_top"
                     android:textSize="@dimen/red_packet_comments_size"
-                    android:text="100.00￥"
                     android:lines="1"
                     android:ellipsize="end"
                     android:textColor="@color/red_packet_comments"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
-                    android:id="@+id/bank_transfer_comments"
+                    android:id="@+id/bank_transfer_value"
                     android:layout_marginTop="6dp"
                     android:layout_toRightOf="@+id/icon"
-                    android:layout_below="@+id/bank_transfer_value"
-                    android:text="备注"
+                    android:layout_below="@+id/bank_transfer_comments"
                     android:textColor="@color/red_packet_text"
                     android:textSize="@dimen/red_packet_text_size"
                     android:layout_width="match_parent"

android/messagelist/src/main/res/drawable-xhdpi/transfer.png

@@ -50,6 +50,7 @@
             android:orientation="vertical">
 
             <RelativeLayout
+                android:id="@+id/layout_top"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@drawable/red_packet_top">
@@ -59,7 +60,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/red_packet_image_margin"
-                    android:src="@drawable/icon_packet" />
+                    android:src="@drawable/transfer" />
 
                 <TextView
                     android:id="@+id/bank_transfer_value"

android/messagelist/src/main/res/layout/item_receive_bank_transfer.xml

@@ -34,6 +34,7 @@
     <dimen name="red_packet_comments_size">16sp</dimen>
     <dimen name="red_packet_text_size">14sp</dimen>
     <dimen name="red_packet_tag_size">10sp</dimen>
+    <dimen name="message_padding">48dp</dimen>
 
 
 </resources>