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

Author: guangyao

android/chatinput/src/main/java/cn/jiguang/imui/chatinput/ChatInputView.java

@@ -187,7 +187,9 @@ private void init(Context context, AttributeSet attrs) {
 //        mSendBtn.setBackground(mStyle.getSendBtnBg());
 //        mSendBtn.setImageResource(mStyle.getSendBtnIcon());
     }
-
+    public void resetVoice() {
+        onChatVoiceTouch.reset();
+    }
     public void addActionView(View view, int index) {
         actionLayout.addView(view, index);
     }
@@ -680,4 +682,6 @@ private long convertStrTimeToLong(String strTime) {
         }
         return SystemClock.elapsedRealtime() - longTime;
     }
+
+
 }

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

@@ -36,15 +36,14 @@ void updateStatus(UpdateStatus status) {
 
     private void onStartAudioRecord() {
         button.setText(text[1]);
-        button.setSelected(false);
+        button.setSelected(true);
         recordHelper.startRecording();
     }
 
     private void onEndAudioRecord(boolean cancel) {
         button.setText(text[0]);
         button.setSelected(false);
 
-
         if (cancel) {
             recordHelper.cancelRecord();
         } else {
@@ -69,6 +68,10 @@ private void updateTimerTip(boolean cancel) {
         button.setText(cancel ? text[2] : text[1]);
     }
 
+    public void reset(){
+        button.setText(text[0]);
+        button.setSelected(false);
+    }
     private boolean isCancelled(View view, MotionEvent event) {
         int[] location = new int[2];
         view.getLocationOnScreen(location);
@@ -91,7 +94,6 @@ public boolean onTouch(View v, MotionEvent event) {
             onEndAudioRecord(isCancelled(v, event));
             updateStatus(isCancelled(v, event) ? UpdateStatus.Canceled : UpdateStatus.Complete);
         } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-//                    touched = true;
             cancelAudioRecord(isCancelled(v, event));
             updateStatus(isCancelled(v, event) ? UpdateStatus.Move : UpdateStatus.Continue);
         }

android/chatinput/src/main/res/drawable/voice_bg.xml

@@ -3,22 +3,29 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="5dp" />
-            <solid android:color="@color/aurora_bg_edittext_default" />
-            <stroke android:width="1dp" android:color="@color/line_bg" />
+            <solid android:color="@color/voice_re_bg_default" />
+            <stroke android:width="1dp" android:color="@color/voice_re_bg" />
         </shape>
     </item>
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:radius="5dp" />
-            <solid android:color="@color/aurora_hint_color_input" />
-            <stroke android:width="1dp" android:color="@color/line_bg" />
+            <solid android:color="@color/voice_re_bg_pressed" />
+            <stroke android:width="1dp" android:color="@color/voice_re_bg" />
         </shape>
     </item>
     <item android:state_focused="true">
         <shape android:shape="rectangle">
             <corners android:radius="8dp" />
-            <solid android:color="@color/aurora_hint_color_input" />
-            <stroke android:width="1dp" android:color="@color/line_bg" />
+            <solid android:color="@color/voice_re_bg_pressed" />
+            <stroke android:width="1dp" android:color="@color/voice_re_bg" />
+        </shape>
+    </item>
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="@color/voice_re_bg_pressed" />
+            <stroke android:width="1dp" android:color="@color/voice_re_bg" />
         </shape>
     </item>
 </selector>

android/chatinput/src/main/res/layout/view_chatinput.xml

@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/aurora_bg_input_default"
+    android:background="@color/chat_input_bg"
     android:orientation="vertical">
 
     <View

android/chatinput/src/main/res/values/colors.xml

@@ -2,6 +2,10 @@
 <resources>
     <color name="white">#ffffff</color>
     <color name="line_bg">#a9a3a3</color>
+    <color name="voice_re_bg">#dadada</color>
+    <color name="voice_re_bg_default">#F7F7F7</color>
+    <color name="voice_re_bg_pressed">#D6D7DC</color>
+    <color name="chat_input_bg">#F7F7F7</color>
 
     <!-->chat input<-->
     <color name="aurora_bg_input_default">#f3f3f3</color>

android/src/main/java/cn/jiguang/imui/messagelist/ReactChatInputManager.java

@@ -174,12 +174,15 @@ public void onStartRecord() {
 
             @Override
             public void onFinishRecord(String voiceFile, boolean isTooLong, int duration) {
+
+
                 if (TextUtils.isEmpty(voiceFile)) {
                     timerTipView.updateStatus(0, 2, 0);
                     handler.sendEmptyMessageDelayed(1, 500);
                     return;
                 }
                 if (isTooLong) {
+                    chatInput.resetVoice();
                     timerTipView.updateStatus(0, 3, 0);
                     handler.sendEmptyMessageDelayed(1, 500);
                 } else {