Skip to content

Commit f44e688

Browse files
xhpxhp
committed
fix message 字段
1 parent 437cd9c commit f44e688

32 files changed

Lines changed: 706 additions & 544 deletions

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,20 +240,22 @@ public void onClick(View view) {
240240
mListener.switchToActionMode();
241241
}
242242

243+
changeVoiceToInput(true);
243244
actionLayout.setVisibility(VISIBLE);
244245
emoticonPickerView.setVisibility(GONE);
245246

246247
} else if (view.getId() == R.id.imui_layout_emoji) {
247248
if (mListener != null) {
248249
mListener.switchToEmojiMode();
249250
}
251+
changeVoiceToInput(true);
250252
emoticonPickerView.setVisibility(VISIBLE);
251253
emoticonPickerView.show(emoticonSelectedListener);
252254
actionLayout.setVisibility(GONE);
253255
}
254256

255257
mLastClickId = view.getId();
256-
requestLayout();
258+
// mMenuContainer.requestLayout();
257259
}
258260
}
259261
};
@@ -390,7 +392,7 @@ public void dismissMenuAndResetSoftMode() {
390392
}
391393

392394
dismissMenuLayout();
393-
setMenuContainerHeight(1);
395+
// setMenuContainerHeight(1);
394396
mChatInput.requestFocus();
395397
}
396398

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
android:layout_width="match_parent"
5858
android:layout_height="match_parent"
5959
android:text="按住 说话"
60-
android:visibility="invisible" />
60+
android:visibility="visible" />
6161
</FrameLayout>
6262

6363
<FrameLayout

‎android/emoji/emoji.iml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -122,19 +122,19 @@
122122
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
123123
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
124124
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
125+
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
125126
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
126127
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
127-
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
128128
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
129129
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
130130
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
131131
<orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
132132
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
133133
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
134+
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
134135
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
135136
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
136137
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
137138
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
138-
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
139139
</component>
140140
</module>

‎android/emoji/src/main/java/dowin/com/emoji/emoji/EmojiManager.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.graphics.drawable.Drawable;
1111
import android.support.v4.util.LruCache;
1212
import android.util.DisplayMetrics;
13+
import android.util.Log;
1314
import android.util.Xml;
1415

1516
import org.xml.sax.Attributes;
@@ -39,8 +40,14 @@ public class EmojiManager {
3940
private static final Map<String, Entry> text2entry = new HashMap<String, Entry>();
4041
// asset bitmap cache, key: asset path
4142
private static LruCache<String, Bitmap> drawableCache;
43+
private static boolean init = false;
4244

4345
public static void init(Context context) {
46+
Log.w(EMOT_DIR,"EmojiManager.init");
47+
if(init){
48+
return;
49+
}
50+
init = true;
4451
load(context, EMOT_DIR + "emoji.xml");
4552

4653
pattern = makePattern();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package cn.jiguang.imui.commons.models;
22

3+
import java.util.Map;
4+
35
/**
46
* Created by dowin on 2017/8/18.
57
*/
@@ -14,7 +16,7 @@ public interface IAccountNotice extends IExtend {
1416

1517
String getAmount();
1618

17-
String getBody();
19+
Map<String,String> getBody();
1820

1921
String getSeriaNo();
2022
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,14 @@ enum MessageStatus {
104104

105105
IExtend getExtend();
106106

107-
// Map<String, String> getExtend();
108-
109107
/**
110108
* Text of message.
111109
*
112110
* @return text
113111
*/
114112
String getText();
115113

116-
/**
117-
* If message type is photo, voice, video or file,
118-
* get file path through this method.
119-
*
120-
* @return file path
121-
*/
122-
String getMediaFilePath();
123-
124114
String getThumb();
125115

126-
/**
127-
* If message type is voice or video, get duration through this method.
128-
*
129-
* @return duration of audio or video
130-
*/
131-
long getDuration();
132-
133116
String getProgress();
134117
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package cn.jiguang.imui.messages.viewholder;
22

3-
import android.graphics.Bitmap;
4-
import android.media.ThumbnailUtils;
5-
import android.provider.MediaStore;
63
import android.support.v7.widget.RecyclerView;
74
import android.view.View;
85
import android.widget.ImageView;
@@ -12,6 +9,7 @@
129
import java.util.concurrent.TimeUnit;
1310

1411
import cn.jiguang.imui.R;
12+
import cn.jiguang.imui.commons.models.IMediaFile;
1513
import cn.jiguang.imui.commons.models.IMessage;
1614
import cn.jiguang.imui.messages.MessageListStyle;
1715

@@ -33,9 +31,11 @@ public VideoViewHolder(RecyclerView.Adapter adapter, View itemView, boolean isSe
3331
public void onBind(final MESSAGE message) {
3432
super.onBind(message);
3533

36-
Bitmap thumb = ThumbnailUtils.createVideoThumbnail(message.getMediaFilePath(),
37-
MediaStore.Images.Thumbnails.MINI_KIND);
38-
mImageCover.setImageBitmap(thumb);
34+
IMediaFile ext = getExtend(message);
35+
if(ext==null){
36+
return;
37+
}
38+
mImageLoader.loadImage(mImageCover,ext.getThumbPath());
3939
mImageCover.setOnClickListener(new View.OnClickListener() {
4040
@Override
4141
public void onClick(View view) {
@@ -52,8 +52,8 @@ public boolean onLongClick(View view) {
5252
});
5353

5454
String durationStr = String.format(Locale.CHINA, "%02d:%02d",
55-
TimeUnit.MILLISECONDS.toMinutes(message.getDuration()),
56-
TimeUnit.MILLISECONDS.toSeconds(message.getDuration()));
55+
TimeUnit.MILLISECONDS.toMinutes(ext.getDuration()),
56+
TimeUnit.MILLISECONDS.toSeconds(ext.getDuration()));
5757
mTvDuration.setText(durationStr);
5858
}
5959

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ public VoiceViewHolder(RecyclerView.Adapter adapter, View itemView, boolean isSe
5555
public void onBind(final MESSAGE message) {
5656
super.onBind(message);
5757

58-
if(message.getMessageStatus()== IMessage.MessageStatus.READED){
59-
mUnreadStatusIv.setVisibility(View.INVISIBLE);
60-
}else {
61-
mUnreadStatusIv.setVisibility(View.VISIBLE);
58+
if(!mIsSender) {
59+
if (message.getMessageStatus() == IMessage.MessageStatus.READED) {
60+
mUnreadStatusIv.setVisibility(View.INVISIBLE);
61+
} else {
62+
mUnreadStatusIv.setVisibility(View.VISIBLE);
63+
}
6264
}
6365
final IMediaFile extend = getExtend(message);
6466
if (extend == null) {

‎android/photoViewPagerview/photoViewPagerview.iml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@
103103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
104104
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
105105
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
106-
<excludeFolder url="file://$MODULE_DIR$/photodraweeview/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" />
107-
<excludeFolder url="file://$MODULE_DIR$/photodraweeview/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.8.1/jars" />
108-
<excludeFolder url="file://$MODULE_DIR$/photodraweeview/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.8.1/jars" />
109-
<excludeFolder url="file://$MODULE_DIR$/photodraweeview/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.8.1/jars" />
110-
<excludeFolder url="file://$MODULE_DIR$/photodraweeview/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.8.1/jars" />
111106
</content>
112107
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
113108
<orderEntry type="sourceFolder" forTests="false" />
@@ -123,7 +118,5 @@
123118
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
124119
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
125120
<orderEntry type="module" module-name="photodraweeview" exported="" />
126-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
127-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
128121
</component>
129122
</module>

‎android/photoViewPagerview/photodraweeview/photodraweeview.iml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

0 commit comments

Comments
 (0)