Skip to content

Commit 1f70896

Browse files
guangyaoguangyao
guangyao
authored and
guangyao
committed
2 parents 1c36a38 + 0628b39 commit 1f70896

9 files changed

Lines changed: 41 additions & 34 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ private void init(Context context) {
148148

149149
mMenuContainer.setVisibility(GONE);
150150
actionLayout.setVisibility(GONE);
151+
mChatVoice.setVisibility(INVISIBLE);
151152

152153
mChatInput.addTextChangedListener(textWatcher);
153154

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.view.View;
66
import android.widget.Button;
77

8+
import cn.jiguang.imui.chatinput.R;
89
import cn.jiguang.imui.chatinput.listener.RecordVoiceListener;
910

1011
/**
@@ -36,13 +37,13 @@ void updateStatus(UpdateStatus status) {
3637

3738
private void onStartAudioRecord() {
3839
button.setText(text[1]);
39-
button.setSelected(true);
40+
button.setBackgroundResource(R.drawable.voice_bg_pressed);
4041
recordHelper.startRecording();
4142
}
4243

4344
private void onEndAudioRecord(boolean cancel) {
4445
button.setText(text[0]);
45-
button.setSelected(false);
46+
button.setBackgroundResource(R.drawable.voice_bg_default);
4647

4748
if (cancel) {
4849
recordHelper.cancelRecord();
@@ -59,7 +60,7 @@ private void onEndAudioRecord(boolean cancel) {
5960
* @param cancel
6061
*/
6162
private void cancelAudioRecord(boolean cancel) {
62-
button.setSelected(true);
63+
button.setBackgroundResource(R.drawable.voice_bg_selected);
6364
updateTimerTip(cancel);
6465
recordHelper.setCancelAble(cancel);
6566
}
@@ -70,7 +71,7 @@ private void updateTimerTip(boolean cancel) {
7071

7172
public void reset(){
7273
button.setText(text[0]);
73-
button.setSelected(false);
74+
button.setBackgroundResource(R.drawable.voice_bg_default);
7475
}
7576
private boolean isCancelled(View view, MotionEvent event) {
7677
int[] location = new int[2];

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

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item>
4-
<shape android:shape="rectangle">
5-
<corners android:radius="5dp" />
6-
<solid android:color="@color/voice_re_bg_default" />
7-
<stroke android:width="1dp" android:color="@color/voice_re_bg" />
8-
</shape>
9-
</item>
10-
<item android:state_pressed="true">
11-
<shape android:shape="rectangle">
12-
<corners android:radius="5dp" />
13-
<solid android:color="@color/voice_re_bg_pressed" />
14-
<stroke android:width="1dp" android:color="@color/voice_re_bg" />
15-
</shape>
16-
</item>
17-
<item android:state_focused="true">
18-
<shape android:shape="rectangle">
19-
<corners android:radius="8dp" />
20-
<solid android:color="@color/voice_re_bg_pressed" />
21-
<stroke android:width="1dp" android:color="@color/voice_re_bg" />
22-
</shape>
23-
</item>
24-
<item android:state_selected="true">
25-
<shape android:shape="rectangle">
26-
<corners android:radius="8dp" />
27-
<solid android:color="@color/voice_re_bg_pressed" />
28-
<stroke android:width="1dp" android:color="@color/voice_re_bg" />
29-
</shape>
30-
</item>
3+
<item android:drawable="@drawable/voice_bg_default" />
4+
<item android:drawable="@drawable/voice_bg_pressed" android:state_pressed="true" />
5+
<item android:drawable="@drawable/voice_bg_pressed" android:state_focused="true" />
6+
<item android:drawable="@drawable/voice_bg_selected" android:state_selected="true" />
317
</selector>

‎android/chatinput/src/main/res/drawable/voice_bg_default.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<corners android:radius="5dp" />
5+
<solid android:color="@color/voice_re_bg_default" />
6+
<stroke
7+
android:width="1dp"
8+
android:color="@color/voice_re_bg" />
9+
</shape>

‎android/chatinput/src/main/res/drawable/voice_bg_pressed.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<corners android:radius="5dp" />
5+
<solid android:color="@color/voice_re_bg_pressed" />
6+
<stroke
7+
android:width="1dp"
8+
android:color="@color/voice_re_bg" />
9+
</shape>

‎android/chatinput/src/main/res/drawable/voice_bg_selected.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<corners android:radius="5dp" />
5+
<solid android:color="@color/voice_re_bg_selected" />
6+
<stroke
7+
android:width="1dp"
8+
android:color="@color/voice_re_bg" />
9+
</shape>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
android:layout_height="@dimen/imui_chat_input_width"
7171
android:background="@drawable/voice_bg"
7272
android:text="按住 说话"
73-
android:visibility="invisible" />
73+
android:visibility="visible" />
7474
</FrameLayout>
7575
<android.support.v4.widget.Space
7676
android:layout_width="@dimen/imui_chat_space"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<color name="white">#ffffff</color>
44
<color name="line_bg">#a9a3a3</color>
55
<color name="voice_re_bg">#dadada</color>
6+
<color name="voice_re_bg_focused">#D6D7DC</color>
7+
<color name="voice_re_bg_selected">#D6D7DC</color>
68
<color name="voice_re_bg_default">#F7F7F7</color>
79
<color name="voice_re_bg_pressed">#D6D7DC</color>
810
<color name="chat_input_bg">#F7F7F7</color>

‎android/chatinput/src/main/res/values/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
<!-- chat input end -->
2424
<dimen name="imui_chat_space">4dp</dimen>
2525
<dimen name="imui_chat_width">38dp</dimen>
26-
<dimen name="imui_chat_input_width">32dp</dimen>
26+
<dimen name="imui_chat_input_width">38dp</dimen>
2727

2828
</resources>

0 commit comments

Comments
 (0)