Skip to content

Commit 7efa62f

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
prepare release 2.0.0-beta3
1 parent f47506c commit 7efa62f

File tree

7 files changed

+31
-32
lines changed

7 files changed

+31
-32
lines changed

‎example/android/app/app.iml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7777
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
7980
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -92,43 +93,48 @@
9293
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9495
</content>
95-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
96+
<orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
9697
<orderEntry type="sourceFolder" forTests="false" />
9798
<orderEntry type="library" name="okio-1.9.0" level="project" />
98-
<orderEntry type="library" name="drawee-0.11.0" level="project" />
99+
<orderEntry type="library" name="gson-2.3.1" level="project" />
100+
<orderEntry type="library" name="imagepipeline-base-1.0.1" level="project" />
99101
<orderEntry type="library" name="textlayoutbuilder-1.0.0" level="project" />
100-
<orderEntry type="library" name="fresco-0.11.0" level="project" />
101102
<orderEntry type="library" name="jsr305-3.0.0" level="project" />
103+
<orderEntry type="library" name="transition-25.3.1" level="project" />
104+
<orderEntry type="library" name="design-25.3.1" level="project" />
102105
<orderEntry type="library" name="bolts-tasks-1.4.0" level="project" />
103106
<orderEntry type="library" name="support-core-ui-25.3.1" level="project" />
107+
<orderEntry type="library" name="drawee-1.0.1" level="project" />
108+
<orderEntry type="library" name="fbcore-1.0.1" level="project" />
104109
<orderEntry type="library" name="okhttp-urlconnection-3.4.1" level="project" />
105110
<orderEntry type="library" name="android-jsc-r174650" level="project" />
106111
<orderEntry type="library" name="staticlayout-proxy-1.0" level="project" />
107-
<orderEntry type="library" name="recyclerview-v7-23.4.0" level="project" />
112+
<orderEntry type="library" name="imagepipeline-okhttp3-1.0.1" level="project" />
113+
<orderEntry type="library" name="glide-3.7.0" level="project" />
108114
<orderEntry type="library" name="support-core-utils-25.3.1" level="project" />
109-
<orderEntry type="library" name="fbcore-0.11.0" level="project" />
110115
<orderEntry type="library" name="support-fragment-25.3.1" level="project" />
111-
<orderEntry type="library" name="imagepipeline-0.11.0" level="project" />
112-
<orderEntry type="library" name="library-2.4.0" level="project" />
116+
<orderEntry type="library" name="fresco-1.0.1" level="project" />
117+
<orderEntry type="library" name="messagelist-0.4.6" level="project" />
113118
<orderEntry type="library" name="jmessage-android_v2.2.1" level="project" />
114-
<orderEntry type="library" name="imagepipeline-base-0.11.0" level="project" />
119+
<orderEntry type="library" name="chatinput-0.4.6-beta" level="project" />
115120
<orderEntry type="library" name="soloader-0.1.0" level="project" />
121+
<orderEntry type="library" name="imagepipeline-1.0.1" level="project" />
116122
<orderEntry type="library" name="javax.inject-1" level="project" />
123+
<orderEntry type="library" name="flexbox-0.2.5" level="project" />
117124
<orderEntry type="library" name="okhttp-ws-3.4.1" level="project" />
118125
<orderEntry type="library" name="support-v4-25.3.1" level="project" />
119126
<orderEntry type="library" name="support-media-compat-25.3.1" level="project" />
120127
<orderEntry type="library" name="okhttp-3.4.1" level="project" />
128+
<orderEntry type="library" name="react-native-0.44.2" level="project" />
121129
<orderEntry type="library" name="jcore-android-1.1.6" level="project" />
122-
<orderEntry type="library" name="imagepipeline-okhttp3-0.11.0" level="project" />
123-
<orderEntry type="library" name="react-native-0.41.0" level="project" />
130+
<orderEntry type="library" name="recyclerview-v7-25.3.1" level="project" />
124131
<orderEntry type="library" name="support-annotations-25.3.1" level="project" />
125132
<orderEntry type="library" name="appcompat-v7-25.3.1" level="project" />
126133
<orderEntry type="library" name="support-vector-drawable-25.3.1" level="project" />
127134
<orderEntry type="library" name="animated-vector-drawable-25.3.1" level="project" />
128135
<orderEntry type="library" name="support-compat-25.3.1" level="project" />
129136
<orderEntry type="module" module-name="jcore-react-native" />
130-
<orderEntry type="module" module-name="react-native-dialog" />
131-
<orderEntry type="module" module-name="react-native-svg" />
137+
<orderEntry type="module" module-name="aurora-imui-react-native" />
132138
<orderEntry type="module" module-name="jmessage-react-plugin" />
133139
</component>
134140
</module>

‎example/android/app/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: "com.android.application"
2-
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
32

43
import com.android.build.OutputFile
54

@@ -142,10 +141,9 @@ android {
142141
}
143142

144143
dependencies {
145-
compile project(':react-native-svg')
146-
compile project(':react-native-dialog')
147144
compile project(':jmessage-react-plugin')
148145
compile project(':jcore-react-native')
146+
compile project(':aurora-imui-react-native')
149147
compile fileTree(dir: "libs", include: ["*.jar"])
150148
compile "com.android.support:appcompat-v7:25.3.1"
151149
compile "com.facebook.react:react-native:+" // From node_modules

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55

66
import com.facebook.react.ReactApplication;
77

8+
import cn.jiguang.imui.messagelist.ReactIMUIPackage;
89
import cn.jpush.im.android.api.JMessageClient;
910
import io.jchat.android.JMessageReactPackage;
1011

1112
import com.facebook.react.ReactNativeHost;
1213
import com.facebook.react.ReactPackage;
1314
import com.facebook.react.shell.MainReactPackage;
1415
import com.facebook.soloader.SoLoader;
15-
import com.honaf.dialog.MyDialogPackage;
16-
import com.horcrux.svg.SvgPackage;
1716

1817
import java.util.Arrays;
1918
import java.util.List;
@@ -33,8 +32,7 @@ protected List<ReactPackage> getPackages() {
3332
return Arrays.<ReactPackage>asList(
3433
new MainReactPackage(),
3534
new JMessageReactPackage(SHUTDOWN_TOAST),
36-
new MyDialogPackage(),
37-
new SvgPackage()
35+
new ReactIMUIPackage()
3836
);
3937
}
4038
};

‎example/android/settings.gradle‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
rootProject.name = 'TestReactJChat'
2-
include ':react-native-svg'
3-
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
4-
include ':react-native-dialog'
5-
project(':react-native-dialog').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-dialog/android')
62
include ':jmessage-react-plugin'
73
project(':jmessage-react-plugin').projectDir = new File(rootProject.projectDir, '../node_modules/jmessage-react-plugin/android')
84
include ':jcore-react-native'
95
project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')
10-
include ':app'
6+
include ':app', ':aurora-imui-react-native'
7+
project(':aurora-imui-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/aurora-imui-react-native/ReactNative/android')
8+

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ export default class Chat extends Component {
5050
this.updateLayout = this.updateLayout.bind(this);
5151
this.onTouchMsgList = this.onTouchMsgList.bind(this);
5252
this.conversation = this.props.navigation.state.params.conversation
53-
Alert.alert("the conversation ",JSON.stringify(this.conversation))
53+
console.log(JSON.stringify(this.conversation))
54+
// Alert.alert("the conversation ",JSON.stringify(this.conversation))
5455
JMessage.getMyInfo((myInfo) => {
5556
this.myInfo = myInfo
5657
})
@@ -371,7 +372,7 @@ export default class Chat extends Component {
371372
onPullToRefresh={this.onPullToRefresh}
372373
avatarSize={{width:40,height:40}}
373374
sendBubbleTextSize={18}
374-
sendBubbleTextColor={"000000"}
375+
sendBubbleTextColor={"#000000"}
375376
sendBubblePadding={{left:10,top:10,right:10,bottom:10}}
376377
/>
377378
<InputView style={this.state.inputViewLayout}

‎example/app/routes/Home/ConversationList/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ export default class ConversationList extends React.Component {
194194
Alert.alert('conversaion', JSON.stringify(conv))
195195
}
196196
this.setState({})
197+
Alert.alert('the item',JSON.stringify(item))
197198
this.props.navigation.navigate('Chat', {
198199
conversation: item
199200
})

‎example/package.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
"start": "node node_modules/react-native/local-cli/cli.js start"
66
},
77
"dependencies": {
8-
"aurora-imui-react-native": "^0.4.12",
8+
"aurora-imui-react-native": "^0.4.14",
99
"jcore-react-native": "^1.1.8-beta",
10-
"jmessage-react-plugin": "file:///Users/HuminiOS/Desktop/workproject/jmessage-react-plugin",
1110
"react": "16.0.0-alpha.12",
12-
"react-native": "^0.41.0",
13-
"react-native-dialog": "^1.0.7",
14-
"react-native-svg": "^5.1.5",
11+
"react-native": "^0.47.1",
1512
"react-navigation": "^1.0.0-beta.11"
1613
},
1714
"devDependencies": {
@@ -21,4 +18,4 @@
2118
"jest": "20.0.4",
2219
"react-test-renderer": "16.0.0-alpha.12"
2320
}
24-
}
21+
}

0 commit comments

Comments
 (0)