Skip to content

Commit 0e018fe

Browse files
author
chenyanan
committed
修复bug若干
1 parent e7b703f commit 0e018fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1050
-166
lines changed

JChat/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
<activity android:name="io.jchat.android.activity.SendFileActivity"/>
204204
<activity android:name="io.jchat.android.activity.PlayVideoActivity"/>
205205
<activity android:name="io.jchat.android.activity.AtMemberActivity"/>
206+
<activity android:name="io.jchat.android.activity.FrowardToPersonActivity"/>
206207
</application>
207208

208209
</manifest>

JChat/Readme

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
JChat项目所依赖第三方库
2+
1.eventBus 3.0.0版本
3+
2.activeandroid 版本 3.1.0-SNAPSHOT
4+
3.百度地图 BaiduLBS_Android(基础地图/基础定位)
5+
4.picasso 版本2.4.0
6+
5.pinyin4j 版本2.5.0
7+
6.nineoldandroids 版本2.4.0
8+
9+
7.jmessage-android 版本2.1.2
10+
8.jcore 版本1.1.0
11+
12+
使用方式:
13+
1.将所需要的依赖库(.jar)拷贝到libs目录下并添加依赖
14+
2.将百度地图以及jmessage的.so文件拷贝到libs目录下
15+
16+
17+
如果需要配置环境需要在io.jchat.android.application.JChatDemoApplication类中,
18+
JMessageClient.init(getApplicationContext(), true);之前添加如下代码
19+
20+
/** 自定义sis **/
21+
List<String> sisIPs = new ArrayList<String>();
22+
sisIPs.add("10.5.172.211");
23+
int sisPort = 9002;
24+
/** 自定义接入 **/
25+
String defaultIp = "10.5.172.205";
26+
int defaultPort = 4000;
27+
/** 自定义report地址 **/
28+
String reportUrl = "http://10.5.172.211:8443";
29+
30+
/** 自定义im http api host&port**/
31+
String httpIp = "10.5.172.211";
32+
int httpPort = 18080;
33+
int syncHttpPort = 8085;
34+
35+
/** fastDfs tracker配置 **/
36+
String fastDfsTrackerHost = "121.46.25.204";
37+
int fastDfsTrackerPort = 22122;
38+
int fastDfsTackerHttpPort = 8080;
39+
40+
/** fastDFS 自定义storage ip port配置 **/
41+
String fastDfsStorageIP = "121.46.25.205"; //供上传时取代tacker返回的storage ip使用,如果不需要自定义则填null
42+
int fastDfsStoragePort = 23000;//供上传时取代tracker返回的storage port使用,如果不需要自定义则填0
43+
44+
JCoreInterface.configHost(null, sisIPs, sisPort, null, defaultIp, defaultPort, reportUrl);
45+
JMessageClient.configHost(httpIp, httpPort, syncHttpPort, fastDfsTrackerHost, fastDfsTrackerPort, fastDfsTackerHttpPort,fastDfsStorageIP,fastDfsStoragePort);
46+
运行方式
47+
1.命令行执行 ./gradlew JChat:installDebug(如果没有权限的话chmod 755 gradlew )
48+
2.点击AndroidStudio工具栏左上部,在下拉窗口中选择"JChat"点击后面的绿色三角箭头
49+
3.点击AndroidStudio右侧纵向Gradle字样,选择"JChat--> Task--> install--> 点击installDebug

JChat/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
33

44
android {
55
compileSdkVersion 23
6-
buildToolsVersion "25.0.2"
6+
buildToolsVersion '25.0.0'
77

88
defaultConfig {
99
applicationId "io.jchat.android"
@@ -75,7 +75,8 @@ android {
7575
dependencies {
7676
compile fileTree(include: ['*.jar'], dir: 'libs')
7777
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
78-
compile files('libs/jmessage-android_debug_v2.1.1_b795.jar')
78+
compile 'org.greenrobot:eventbus:3.0.0'
79+
compile files('libs/jmessage-android_debug_v2.1.2_b731_forPCloudWithFastDfs.jar')
7980
}
8081

8182

218 KB
Binary file not shown.
161 KB
Binary file not shown.
197 KB
Binary file not shown.

JChat/libs/eventbus.jar

-42.9 KB
Binary file not shown.
-432 KB
Binary file not shown.
267 KB
Binary file not shown.

JChat/libs/jmessage-FastDfs.jar

69.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)