Skip to content

Commit 1863df0

Browse files
KenChoiKenChoi
authored andcommitted
add serverMessageId
1 parent 111e7d3 commit 1863df0

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

android/src/io/jchat/android/Constant.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class Constant {
2424
public static final String TYPE_GROUP = "group";
2525
public static final String TYPE_SINGLE = "single";
2626
public static final String ID = "id";
27+
public static final String SERVER_ID = "serverMessageId";
2728
public static final String MESSAGE_ID = "messageId";
2829
public static final String GROUP_ID = "groupId";
2930
public static final String NAME = "name";
@@ -44,11 +45,11 @@ public class Constant {
4445
public static final String LIMIT = "limit";
4546
public static final String CREATE_TIME = "createTime";
4647
public static final String TEXT = "text";
47-
static final String IMAGE = "image";
48-
static final String VOICE = "voice";
49-
static final String LOCATION = "location";
50-
static final String FILE = "file";
51-
static final String CUSTOM = "custom";
48+
public static final String IMAGE = "image";
49+
public static final String VOICE = "voice";
50+
public static final String LOCATION = "location";
51+
public static final String FILE = "file";
52+
public static final String CUSTOM = "custom";
5253
public static final String EXTRAS = "extras";
5354
public static final String THUMB_PATH = "thumbPath";
5455
public static final String PATH = "path";

android/src/io/jchat/android/utils/ResultUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public static WritableMap toJSObject(Message msg) {
119119
WritableMap result = Arguments.createMap();
120120
try {
121121
result.putString(Constant.ID, String.valueOf(msg.getId()));
122+
result.putString(Constant.SERVER_ID, String.valueOf(msg.getServerMessageId()));
122123
result.putMap(Constant.FROM, toJSObject(msg.getFromUser()));
123124

124125
if (msg.getDirect() == MessageDirect.send) {

example/android/app/app.iml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -108,19 +107,19 @@
108107
<orderEntry type="library" name="com.github.w446108264:AndroidEmoji-1.0.0" level="project" />
109108
<orderEntry type="library" name="com.google.android:flexbox-0.2.5" level="project" />
110109
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.0.1" level="project" />
111-
<orderEntry type="library" name="cn.jiguang.imui:chatinput-0.5.0" level="project" />
110+
<orderEntry type="library" name="cn.jiguang.imui:chatinput-0.5.6" level="project" />
112111
<orderEntry type="library" name="javax.inject:javax.inject:1@jar" level="project" />
113112
<orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
114113
<orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
115114
<orderEntry type="library" name="com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
116115
<orderEntry type="library" name="com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
117116
<orderEntry type="library" name="com.facebook.react:react-native-0.44.2" level="project" />
118117
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.4.1@jar" level="project" />
119-
<orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.2" level="project" />
120118
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.1.7.jar:unspecified@jar" level="project" />
121119
<orderEntry type="library" name="com.facebook.soloader:soloader-0.1.0" level="project" />
122120
<orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
123121
<orderEntry type="library" name="com.github.w446108264:XhsEmoticonsKeyboard-2.0.4" level="project" />
122+
<orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.5" level="project" />
124123
<orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
125124
<orderEntry type="library" name="com.facebook.fresco:fresco-1.0.1" level="project" />
126125
<orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"start": "node node_modules/react-native/local-cli/cli.js start"
66
},
77
"dependencies": {
8-
"aurora-imui-react-native": "^0.5.6",
8+
"aurora-imui-react-native": "^0.5.14",
99
"jcore-react-native": "^1.2.1",
1010
"jmessage-react-plugin": "^2.1.0",
1111
"react": "16.0.0-alpha.12",

0 commit comments

Comments
 (0)