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

Author: guangyao

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

@@ -57,7 +57,7 @@ public void startRecording() {
             recorder = new MediaRecorder();
             recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
             recorder.setMaxDuration(MAX_INTERVAL_TIME * 1000);
-            recorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
+            recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
             recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
 //            recorder.setAudioEncodingBitRate();
 //            recorder.setAudioSamplingRate();

android/emoji/.gitignore

@@ -1 +1,2 @@
 /build
+*.iml

android/messagelist/build.gradle

@@ -26,6 +26,8 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':react-native-imui:emoji')
     compile project(':react-native-imui:photoViewPagerview')
+
+    compile 'com.facebook.fresco:fresco:1.0.1'
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })

android/messagelist/proguard-rules.pro

@@ -27,3 +27,4 @@
     public static int d(...);
     public static int e(...);
 }
+

android/messagelist/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cn.jiguang.imui">
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <application
         android:allowBackup="true"
         android:supportsRtl="true">

android/messagelist/src/main/java/cn/jiguang/imui/commons/models/IMessage.java

@@ -88,19 +88,19 @@ enum MessageType {
      * Status of message, enum.
      */
     enum MessageStatus {
-        READED,
-        CREATED,
-        SEND_GOING,
+        RECEIVE_UNREAD,
+        RECEIVE_READ,
+        SEND_SENDING,
         SEND_SUCCEED,
-        SEND_FAILED,
+        SEND_FAILE,
         SEND_DRAFT,
-        RECEIVE_GOING,
-        RECEIVE_SUCCEED,
-        RECEIVE_FAILED;
+        SEND_SUCCESS;
     }
 
     MessageStatus getMessageStatus();
 
+    void setMessageStatus(MessageStatus status);
+
 
     IExtend getExtend();
 
@@ -113,5 +113,5 @@ enum MessageStatus {
 
     String getThumb();
 
-    String getProgress();
+//    String getProgress();
 }

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

@@ -70,12 +70,12 @@ public void onBind(final MESSAGE message) {
             }
         } else {
             switch (message.getMessageStatus()) {
-                case SEND_GOING:
+                case SEND_SENDING:
                     mSendingPb.setVisibility(View.VISIBLE);
                     mResendIb.setVisibility(View.INVISIBLE);
                     Log.i("TxtViewHolder", "sending message");
                     break;
-                case SEND_FAILED:
+                case SEND_FAILE:
                     mSendingPb.setVisibility(View.GONE);
                     Log.i("TxtViewHolder", "send message failed");
                     mResendIb.setVisibility(View.VISIBLE);
@@ -89,10 +89,16 @@ public void onClick(View v) {
                     });
                     break;
                 case SEND_SUCCEED:
+                case RECEIVE_READ:
+                case RECEIVE_UNREAD:
                     mSendingPb.setVisibility(View.GONE);
                     mResendIb.setVisibility(View.INVISIBLE);
                     Log.i("TxtViewHolder", "send message succeed");
                     break;
+                default:
+                    mSendingPb.setVisibility(View.GONE);
+                    mResendIb.setVisibility(View.INVISIBLE);
+                    break;
             }
         }
 

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

@@ -1,5 +1,6 @@
 package cn.jiguang.imui.messages.viewholder;
 
+import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
@@ -28,7 +29,7 @@ public void onBind(final MESSAGE message) {
 //        mMsgTv.setText(message.getText());
         String mText = message.getText();
 
-        mMsgTv.setText(mText);
+        mMsgTv.setText("暂不支持该消息类型");
 
         mMsgTv.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -57,39 +58,8 @@ public boolean onLongClick(View view) {
     @Override
     public void applyStyle(MessageListStyle style) {
         mMsgTv.setMaxWidth((int) (style.getWindowWidth() * style.getBubbleMaxWidth()));
-        if (mIsSender) {
-            mMsgTv.setBackground(style.getSendBubbleDrawable());
-            mMsgTv.setTextColor(style.getSendBubbleTextColor());
-            mMsgTv.setTextSize(style.getSendBubbleTextSize());
-            mMsgTv.setPadding(style.getSendBubblePaddingLeft(),
-                    style.getSendBubblePaddingTop(),
-                    style.getSendBubblePaddingRight(),
-                    style.getSendBubblePaddingBottom());
-            if (style.getSendingProgressDrawable() != null) {
-                mSendingPb.setProgressDrawable(style.getSendingProgressDrawable());
-            }
-            if (style.getSendingIndeterminateDrawable() != null) {
-                mSendingPb.setIndeterminateDrawable(style.getSendingIndeterminateDrawable());
-            }
-        } else {
-            mMsgTv.setBackground(style.getReceiveBubbleDrawable());
-            mMsgTv.setTextColor(style.getReceiveBubbleTextColor());
-            mMsgTv.setTextSize(style.getReceiveBubbleTextSize());
-            mMsgTv.setPadding(style.getReceiveBubblePaddingLeft(),
-                    style.getReceiveBubblePaddingTop(),
-                    style.getReceiveBubblePaddingRight(),
-                    style.getReceiveBubblePaddingBottom());
-            if (style.getShowDisplayName() == 1) {
-                mDisplayNameTv.setVisibility(View.VISIBLE);
-            }
-        }
-        mDateTv.setTextSize(style.getDateTextSize());
-        mDateTv.setTextColor(style.getDateTextColor());
-
-        android.view.ViewGroup.LayoutParams layoutParams = mAvatarIv.getLayoutParams();
-        layoutParams.width = style.getAvatarWidth();
-        layoutParams.height = style.getAvatarHeight();
-        mAvatarIv.setLayoutParams(layoutParams);
+        mMsgTv.setTextSize(17);
+        mMsgTv.setLinkTextColor(Color.rgb(173,0,151));
     }
 
 

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

@@ -32,7 +32,7 @@ public void onBind(MESSAGE message) {
     @Override
     public void applyStyle(MessageListStyle style) {
 
-        mEvent.setTextColor(Color.rgb(157, 157, 158));
+        mEvent.setTextColor(Color.WHITE);
         mEvent.setTextSize(style.getEventTextSize());
         mEvent.setPadding(style.getEventPadding(), style.getEventPadding(), style.getEventPadding(), style.getEventPadding());
     }

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

@@ -32,10 +32,10 @@ public void onBind(final MESSAGE message) {
         super.onBind(message);
 
         IMediaFile ext = getExtend(message);
-        if(ext==null){
+        if (ext == null) {
             return;
         }
-        mImageLoader.loadImage(mImageCover,ext.getThumbPath());
+        mImageLoader.loadImage(mImageCover, ext.getThumbPath());
         mImageCover.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {