CNLive Android Team / CNIMDemo · Commits

Commit 67d28b495e8d4b2d2bda4d56ae0c5c72959a8a91

Authored by 谷俊
2 parents 3c9a1078 bc1f3ac8

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNIMDemo 

# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/cnlive/im/CNLiveApplication.java
Inline Side-by-side
Showing 4 changed files with 12 additions and 5 deletions
.idea/vcs.xml
  View file @67d28b4
@@ -2,6 +2,5 @@ @@ -2,6 +2,5 @@
2 <project version="4"> 2 <project version="4">
3 <component name="VcsDirectoryMappings"> 3 <component name="VcsDirectoryMappings">
4 <mapping directory="" vcs="Git" /> 4 <mapping directory="" vcs="Git" />
5 - <mapping directory="$PROJECT_DIR$" vcs="Git" />  
6 </component> 5 </component>
7 </project> 6 </project>
8 \ No newline at end of file 7 \ No newline at end of file
README.md 0 → 100644
  View file @67d28b4
  1 +视讯云聊天sdk
  2 +====
  3 +#### CNChat Android SDK是视讯云推出的 Android平台上使用的软件开发工具包(SDK),负责聊天室的加入发消息等。使用文档详见 [聊天sdk3.0文档wiki](http://bj.gitlab.cnlive.com/cnlive-team/CNIMDemo/wikis/home)
  4 +或 [聊天sdk2.0文档wiki](http://bj.gitlab.cnlive.com/cnlive-team/CNIMDemo/wikis/home2)
0 \ No newline at end of file 5 \ No newline at end of file
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
  View file @67d28b4
@@ -121,7 +121,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL @@ -121,7 +121,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
121 mHandler = new Handler(); 121 mHandler = new Handler();
122 ChatUtil.setOnConnectStatusListener(connectStatusListener); 122 ChatUtil.setOnConnectStatusListener(connectStatusListener);
123 ChatUtil.setOnChatRoomActionListener(chatRoomActionListener); 123 ChatUtil.setOnChatRoomActionListener(chatRoomActionListener);
124 - ChatUtil.setOnReceiveMessageListener(receiveMessageListener); 124 + ChatUtil.setOnReceiveChatroomMessageListener(receiveMessageListener);
125 ChatUtil.setKickedOfflineListener(onKickedOfflineListener); 125 ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
126 Intent intent = getIntent(); 126 Intent intent = getIntent();
127 user_name_string = intent.getStringExtra("user_name_string"); 127 user_name_string = intent.getStringExtra("user_name_string");
@@ -169,10 +169,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL @@ -169,10 +169,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
169 keybordBtn = (ImageView) findViewById(R.id.keybord); 169 keybordBtn = (ImageView) findViewById(R.id.keybord);
170 keybordBtn.setOnClickListener(this); 170 keybordBtn.setOnClickListener(this);
171 171
172 -  
173 StartListener(); 172 StartListener();
174 173
175 -  
176 } 174 }
177 175
178 176
build.gradle
  View file @67d28b4
@@ -3,10 +3,13 @@ @@ -3,10 +3,13 @@
3 buildscript { 3 buildscript {
4 repositories { 4 repositories {
5 jcenter() 5 jcenter()
  6 + maven {
  7 + url 'https://dl.bintray.com/granzon/cnlive/'
  8 + }
6 } 9 }
7 dependencies { 10 dependencies {
8 classpath 'com.android.tools.build:gradle:2.3.3' 11 classpath 'com.android.tools.build:gradle:2.3.3'
9 - 12 +// compile 'com.inthecheesefactory.thecheeselibrary:fb-like:0.9.3'
10 // NOTE: Do not place your application dependencies here; they belong 13 // NOTE: Do not place your application dependencies here; they belong
11 // in the individual module build.gradle files 14 // in the individual module build.gradle files
12 } 15 }
@@ -15,6 +18,9 @@ buildscript { @@ -15,6 +18,9 @@ buildscript {
15 allprojects { 18 allprojects {
16 repositories { 19 repositories {
17 jcenter() 20 jcenter()
  21 + maven {
  22 + url 'https://dl.bintray.com/granzon/cnlive/'
  23 + }
18 } 24 }
19 } 25 }
20 26