Commit 1c22353c1a4df1034459710c229a8ddc57ed86af
1 parent
099a1432
聊天室登录成功状态
Showing
5 changed files
with
6 additions
and
4 deletions
.idea/misc.xml
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | <ConfirmationsSetting value="0" id="Add" /> | 37 | <ConfirmationsSetting value="0" id="Add" /> |
| 38 | <ConfirmationsSetting value="0" id="Remove" /> | 38 | <ConfirmationsSetting value="0" id="Remove" /> |
| 39 | </component> | 39 | </component> |
| 40 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | 40 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> |
| 41 | <output url="file://$PROJECT_DIR$/build/classes" /> | 41 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | </component> | 42 | </component> |
| 43 | <component name="ProjectType"> | 43 | <component name="ProjectType"> |
app/libs/libcnlivechat.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/chat/MainActivity.java
| @@ -121,6 +121,8 @@ public class MainActivity extends AppCompatActivity implements ChatCallback { | @@ -121,6 +121,8 @@ public class MainActivity extends AppCompatActivity implements ChatCallback { | ||
| 121 | break; | 121 | break; |
| 122 | case ChatState.StateConnect: //与服务器建立连接 | 122 | case ChatState.StateConnect: //与服务器建立连接 |
| 123 | break; | 123 | break; |
| 124 | + case ChatState.StateJoin: //聊天室登录成功 | ||
| 125 | + break; | ||
| 124 | case ChatState.StateReconnect: //与服务器重新连接 | 126 | case ChatState.StateReconnect: //与服务器重新连接 |
| 125 | //TODO 自动重连后 调用connectChat();重新连接聊天室 | 127 | //TODO 自动重连后 调用connectChat();重新连接聊天室 |
| 126 | connectChat(); | 128 | connectChat(); |
build.gradle
| @@ -5,7 +5,7 @@ buildscript { | @@ -5,7 +5,7 @@ buildscript { | ||
| 5 | jcenter() | 5 | jcenter() |
| 6 | } | 6 | } |
| 7 | dependencies { | 7 | dependencies { |
| 8 | - classpath 'com.android.tools.build:gradle:2.1.2' | 8 | + classpath 'com.android.tools.build:gradle:2.1.3' |
| 9 | 9 | ||
| 10 | // NOTE: Do not place your application dependencies here; they belong | 10 | // NOTE: Do not place your application dependencies here; they belong |
| 11 | // in the individual module build.gradle files | 11 | // in the individual module build.gradle files |
gradle/wrapper/gradle-wrapper.properties
| 1 | -#Mon Dec 28 10:00:20 PST 2015 | 1 | +#Wed Sep 14 16:24:42 CST 2016 |
| 2 | distributionBase=GRADLE_USER_HOME | 2 | distributionBase=GRADLE_USER_HOME |
| 3 | distributionPath=wrapper/dists | 3 | distributionPath=wrapper/dists |
| 4 | zipStoreBase=GRADLE_USER_HOME | 4 | zipStoreBase=GRADLE_USER_HOME |
| 5 | zipStorePath=wrapper/dists | 5 | zipStorePath=wrapper/dists |
| 6 | -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip | 6 | +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |