Skip to content

Commit 40cce43

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
modify example
1 parent 4dbf9dc commit 40cce43

File tree

10 files changed

+101
-77
lines changed

10 files changed

+101
-77
lines changed

‎android/ReactJChat.iml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎android/proguard-rules.pro‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎example/android/app/app.iml‎

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,35 @@
2424
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2525
<exclude-output />
2626
<content url="file://$MODULE_DIR$">
27+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
2728
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
2829
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
2930
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4243
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
4856
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
4957
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5058
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -79,6 +87,7 @@
7987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
8189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
8493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -94,48 +103,49 @@
94103
</content>
95104
<orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
96105
<orderEntry type="sourceFolder" forTests="false" />
97-
<orderEntry type="library" name="okio-1.9.0" level="project" />
98-
<orderEntry type="library" name="imagepipeline-base-1.0.1" level="project" />
99-
<orderEntry type="library" name="chatinput-0.4.9" level="project" />
100-
<orderEntry type="library" name="XhsEmoticonsKeyboard-2.0.4" level="project" />
101-
<orderEntry type="library" name="textlayoutbuilder-1.0.0" level="project" />
102-
<orderEntry type="library" name="gson-2.8.0" level="project" />
103-
<orderEntry type="library" name="AndroidEmoji-1.0.0" level="project" />
104-
<orderEntry type="library" name="jsr305-3.0.0" level="project" />
105-
<orderEntry type="library" name="transition-25.3.1" level="project" />
106-
<orderEntry type="library" name="design-25.3.1" level="project" />
107-
<orderEntry type="library" name="bolts-tasks-1.4.0" level="project" />
108-
<orderEntry type="library" name="support-core-ui-25.3.1" level="project" />
109-
<orderEntry type="library" name="drawee-1.0.1" level="project" />
110-
<orderEntry type="library" name="fbcore-1.0.1" level="project" />
111-
<orderEntry type="library" name="okhttp-urlconnection-3.4.1" level="project" />
112-
<orderEntry type="library" name="android-jsc-r174650" level="project" />
113-
<orderEntry type="library" name="staticlayout-proxy-1.0" level="project" />
114-
<orderEntry type="library" name="imagepipeline-okhttp3-1.0.1" level="project" />
115-
<orderEntry type="library" name="glide-3.7.0" level="project" />
116-
<orderEntry type="library" name="support-core-utils-25.3.1" level="project" />
117-
<orderEntry type="library" name="support-fragment-25.3.1" level="project" />
118-
<orderEntry type="library" name="fresco-1.0.1" level="project" />
119-
<orderEntry type="library" name="jmessage-android_v2.3.0" level="project" />
120-
<orderEntry type="library" name="soloader-0.1.0" level="project" />
121-
<orderEntry type="library" name="imagepipeline-1.0.1" level="project" />
122-
<orderEntry type="library" name="javax.inject-1" level="project" />
123-
<orderEntry type="library" name="eventbus-3.0.0" level="project" />
124-
<orderEntry type="library" name="messagelist-0.4.9" level="project" />
125-
<orderEntry type="library" name="flexbox-0.2.5" level="project" />
126-
<orderEntry type="library" name="okhttp-ws-3.4.1" level="project" />
127-
<orderEntry type="library" name="support-v4-25.3.1" level="project" />
128-
<orderEntry type="library" name="support-media-compat-25.3.1" level="project" />
129-
<orderEntry type="library" name="okhttp-3.4.1" level="project" />
130-
<orderEntry type="library" name="react-native-0.44.2" level="project" />
131-
<orderEntry type="library" name="jcore-android-1.1.6" level="project" />
132-
<orderEntry type="library" name="recyclerview-v7-25.3.1" level="project" />
133-
<orderEntry type="library" name="support-annotations-25.3.1" level="project" />
134-
<orderEntry type="library" name="appcompat-v7-25.3.1" level="project" />
135-
<orderEntry type="library" name="support-vector-drawable-25.3.1" level="project" />
136-
<orderEntry type="library" name="animated-vector-drawable-25.3.1" level="project" />
137-
<orderEntry type="library" name="support-compat-25.3.1" level="project" />
106+
<orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
107+
<orderEntry type="library" name="cn.jiguang.imui:chatinput-0.4.9" level="project" />
108+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-ws:3.4.1@jar" level="project" />
109+
<orderEntry type="library" name="com.github.w446108264:AndroidEmoji-1.0.0" level="project" />
110+
<orderEntry type="library" name="com.google.android:flexbox-0.2.5" level="project" />
111+
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.0.1" level="project" />
112+
<orderEntry type="library" name="javax.inject:javax.inject:1@jar" level="project" />
113+
<orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
114+
<orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
115+
<orderEntry type="library" name="com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
116+
<orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.0" level="project" />
117+
<orderEntry type="library" name="com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
118+
<orderEntry type="library" name="com.facebook.react:react-native-0.44.2" level="project" />
119+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.4.1@jar" level="project" />
120+
<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" />
121+
<orderEntry type="library" name="com.facebook.soloader:soloader-0.1.0" level="project" />
122+
<orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
123+
<orderEntry type="library" name="com.github.w446108264:XhsEmoticonsKeyboard-2.0.4" level="project" />
124+
<orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
125+
<orderEntry type="library" name="com.facebook.fresco:fresco-1.0.1" level="project" />
126+
<orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
127+
<orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
128+
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-okhttp3-1.0.1" level="project" />
129+
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-1.0.1" level="project" />
130+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.4.1@jar" level="project" />
131+
<orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
132+
<orderEntry type="library" name="com.facebook.fresco:fbcore-1.0.1" level="project" />
133+
<orderEntry type="library" name="com.facebook.fresco:drawee-1.0.1" level="project" />
134+
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-android_v2.3.0.jar:unspecified@jar" level="project" />
135+
<orderEntry type="library" name="com.android.support:transition-25.3.1" level="project" />
136+
<orderEntry type="library" name="com.android.support:design-25.3.1" level="project" />
137+
<orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
138+
<orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
139+
<orderEntry type="library" name="org.greenrobot:eventbus:3.0.0@jar" level="project" />
140+
<orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
141+
<orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:textlayoutbuilder-1.0.0" level="project" />
142+
<orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
143+
<orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
144+
<orderEntry type="library" name="org.webkit:android-jsc-r174650" level="project" />
145+
<orderEntry type="library" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
146+
<orderEntry type="library" name="com.squareup.okio:okio:1.9.0@jar" level="project" />
138147
<orderEntry type="module" module-name="jcore-react-native" />
148+
<orderEntry type="module" module-name="react-native-fs" />
139149
<orderEntry type="module" module-name="aurora-imui-react-native" />
140150
<orderEntry type="module" module-name="jmessage-react-plugin" />
141151
</component>

‎example/android/app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def enableProguardInReleaseBuilds = false
8484

8585
android {
8686
compileSdkVersion 25
87-
buildToolsVersion "25.0.2"
87+
buildToolsVersion "26.0.2"
8888

8989
defaultConfig {
9090
applicationId "com.sample.applicaiton"
@@ -141,6 +141,7 @@ android {
141141
}
142142

143143
dependencies {
144+
compile project(':react-native-fs')
144145
compile project(':jmessage-react-plugin')
145146
compile project(':jcore-react-native')
146147
compile project(':aurora-imui-react-native')

‎example/android/app/src/com/sample/application/MainApplication.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.facebook.react.ReactPackage;
1414
import com.facebook.react.shell.MainReactPackage;
1515
import com.facebook.soloader.SoLoader;
16+
import com.rnfs.RNFSPackage;
1617

1718
import java.util.Arrays;
1819
import java.util.List;
@@ -32,7 +33,8 @@ protected List<ReactPackage> getPackages() {
3233
return Arrays.<ReactPackage>asList(
3334
new MainReactPackage(),
3435
new JMessageReactPackage(SHUTDOWN_TOAST),
35-
new ReactIMUIPackage()
36+
new ReactIMUIPackage(),
37+
new RNFSPackage()
3638
);
3739
}
3840
};

‎example/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515
}
1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:3.0.0-beta2'
17+
classpath 'com.android.tools.build:gradle:3.0.0'
1818

1919
// NOTE: Do not place your application dependencies here; they belong
2020
// in the individual module build.gradle files

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Aug 11 14:16:45 CST 2017
1+
#Wed Nov 15 15:21:15 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎example/android/settings.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rootProject.name = 'TestReactJChat'
2+
include ':react-native-fs'
3+
project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
24
include ':jmessage-react-plugin'
35
project(':jmessage-react-plugin').projectDir = new File(rootProject.projectDir, '../node_modules/jmessage-react-plugin/android')
46
include ':jcore-react-native'

‎example/app/routes/Chat/index.js‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import React, { Component } from 'react';
88
import {
99
AppRegistry,
10+
Button,
1011
StyleSheet,
1112
Text,
1213
View,
@@ -127,6 +128,33 @@ export default class Chat extends Component {
127128
return message
128129
}
129130

131+
sendCustomMessage = () => {
132+
var messages = [];
133+
for (var i=0; i< 10; i++) {
134+
var message = this.getNormalMessage()
135+
message.msgType = "custom"
136+
message.msgId = "10"
137+
message.status = "send_going"
138+
message.isOutgoing = true
139+
message.content = '<body bgcolor="#ff3399"><h5>This is a custom message. </h5>\
140+
<img src="/storage/emulated/0/XhsEmoticonsKeyboard/Emoticons/wxemoticons/icon_040_cover.png"></img></body>'
141+
message.contentSize = {'height': 400, 'width': 400}
142+
message.extras = {"extras": "fdfsf"}
143+
var user = {
144+
userId: "1",
145+
displayName: "",
146+
avatarPath: ""
147+
}
148+
user.displayName = "0001"
149+
user.avatarPath = "ironman"
150+
message.fromUser = user
151+
messages[i] = message;
152+
}
153+
154+
AuroraIController.appendMessages(messages);
155+
156+
}
157+
130158
componentDidMount() {
131159
var parames = {
132160

@@ -183,6 +211,10 @@ export default class Chat extends Component {
183211
JMessage.addReceiveMessageListener(this.receiveMessageCallBack)
184212
}
185213
AuroraIController.addMessageListDidLoadListener(this.messageListDidLoadCallback)
214+
this.timer = setTimeout(() => {
215+
console.log("Sending custom message")
216+
this.sendCustomMessage();
217+
}, 2000)
186218
}
187219

188220
componentWillUnmount() {
@@ -258,8 +290,8 @@ export default class Chat extends Component {
258290
if (Platform.OS === "android") {
259291
this.timer = setTimeout(() => {
260292
console.log("send refresh complete event")
261-
this.refs["PtrLayout"].refreshComplete()
262-
},2000);
293+
this.refs["PtrLayout"].refreshComplete()
294+
}, 2000);
263295
}
264296
}
265297

@@ -425,7 +457,7 @@ export default class Chat extends Component {
425457
} else {
426458
this.updateLayout({ width: window.width, height: 338, })
427459
}
428-
460+
429461
}
430462

431463
onSwitchToGalleryMode = () => {

‎example/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
},
77
"dependencies": {
88
"aurora-imui-react-native": "^0.4.14",
9-
"jcore-react-native": "^1.1.8-beta",
9+
"jcore-react-native": "^1.2.2",
1010
"jmessage-react-plugin": "^2.1.0",
1111
"react": "16.0.0-alpha.12",
1212
"react-native": "^0.47.1",
13-
"react-native-fs": "^2.8.3",
13+
"react-native-fs": "^2.8.5",
1414
"react-navigation": "^1.0.0-beta.11",
1515
"react-timer-mixin": "^0.13.3"
1616
},
@@ -21,4 +21,4 @@
2121
"jest": "20.0.4",
2222
"react-test-renderer": "16.0.0-alpha.12"
2323
}
24-
}
24+
}

0 commit comments

Comments
 (0)