修改聊天demo

陈硕
1 parent be545209
Showing 3 changed files with 63 additions and 46 deletions
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/MainActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
@@ -36,7 +36,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private ListView listViewOne;
     private ChatListAdapter chatListAdapterOne, chatListAdapterTwo;
     private ListView listViewTwo;
-    private Button user_switchBtn, reconnectionBtn, switch_visitorsBtn, foundChatBtn, disconnectBtn;
+    private Button user_switchBtn, foundChatBtn;
     private Button creatChat2Btn;
     private Handler mHandler;
     private RelativeLayout re_chat;
@@ -72,10 +72,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         lin_user = (LinearLayout) findViewById(R.id.lin_user);
         re_chat = (RelativeLayout) findViewById(R.id.re_chat);
         creatChat2Btn = (Button) findViewById(R.id.creatChat2);
-        disconnectBtn = (Button) findViewById(R.id.disconnect);
         foundChatBtn = (Button) findViewById(R.id.creatChat);
-        switch_visitorsBtn = (Button) findViewById(R.id.switch_visitors);
-        reconnectionBtn = (Button) findViewById(R.id.connectionBtn);
         user_switchBtn = (Button) findViewById(R.id.user_switch);
         listViewOne = (ListView) findViewById(R.id.chat_list_viewOne);
         listViewTwo = (ListView) findViewById(R.id.chat_list_viewTwo);
@@ -85,13 +82,10 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         exit_chat1.setOnClickListener(this);
         exit_chat2.setOnClickListener(this);
         user_imfor_send.setOnClickListener(this);
-        disconnectBtn.setOnClickListener(this);
         foundChatBtn.setOnClickListener(this);
         send_messageOneBtn.setOnClickListener(this);
         send_messageOneTwo.setOnClickListener(this);
-        reconnectionBtn.setOnClickListener(this);
         user_switchBtn.setOnClickListener(this);
-        switch_visitorsBtn.setOnClickListener(this);
         creatChat2Btn.setOnClickListener(this);
         groupChatOneListMy = new ArrayList<>();
         groupChatTwoListMy = new ArrayList<>();
@@ -114,7 +108,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onSuccess(String s) {
             Log.e(TAG, "ConnectListener 连接监听" + s);
-            Toast.makeText(ChatRoomActivity.this, "连接成功", Toast.LENGTH_SHORT).show();
+            //Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
         }
         @Override
@@ -241,7 +235,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onQuited(String s) {
             Log.i(TAG, "chatRoomActionListener     " + "onQuited" + s);
-
         }
         @Override
@@ -269,7 +262,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private IChat.OnOperationListener onOperationListener = new IChat.OnOperationListener() {
         @Override
         public void onSuccess(int what, final String extra) {
-            Log.v(TAG,  + what + extra);
+            Log.v(TAG, +what + extra);
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
@@ -312,27 +305,12 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 break;
             // 用户
             case R.id.user_switch:
-                ChatUtil.login(cnUser, connectListener);
-                break;
-            //连接
-            case R.id.connectionBtn:
-                ChatUtil.connect(connectListener);
-                break;
-
-            // 切换成游客
-            case R.id.switch_visitors:
-
-
-                ChatUtil.logOut(connectListener);
+                re_chat.setVisibility(View.INVISIBLE);
+                lin_user.setVisibility(View.VISIBLE);
                 break;
             // 创建聊天
             case R.id.creatChat:
                 ChatUtil.joinChatRoom(roomIdOne, -1, onOperationListener);
-                break;
-            //  断开连接
-            case R.id.disconnect:
-                ChatUtil.disconnect(false);
-                break;
             //加入聊天室2
             case R.id.creatChat2:
                 ChatUtil.joinChatRoom(roomIdTwo, -1, onOperationListener);
@@ -354,21 +332,13 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     Toast.makeText(ChatRoomActivity.this, "用户名不能为空", Toast.LENGTH_SHORT).show();
                 else {
                     cnUser = new CNUserInfo(user_id.getText().toString(), user_name.getText().toString(), "");
-                    lin_user.setVisibility(View.INVISIBLE);
+                    ChatUtil.login(cnUser, connectListener);
                     re_chat.setVisibility(View.VISIBLE);
+                    lin_user.setVisibility(View.INVISIBLE);
                 }
                 break;
-
-
         }
     }
-    @Override
-    protected void onPause() {
-        super.onPause();
-        ChatUtil.quitChatRoom(roomIdTwo, onOperationListener);
-        ChatUtil.quitChatRoom(roomIdOne, onOperationListener);
-    }
-
 }
@@ -3,15 +3,24 @@ package com.cnlive.im.ui;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.Toast;
 import com.cnlive.im.R;
+import com.cnlive.libs.util.chat.ChatUtil;
+import com.cnlive.libs.util.chat.base.IChat;
+
+import static com.cnlive.im.R.id.connect;
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
     private Button groupChatBtn, privateChat;
+    private String TAG = "MainActivity";
+    private Button connectBtn;
+    private Button re_connect;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -20,12 +29,40 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         initUI();
     }
+    //连接监听
+    private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
+        @Override
+        public void onTokenIncorrect() {
+            Log.e(TAG, "ConnectListener TokenIncorrect");
+            Toast.makeText(MainActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
+            connectBtn.setText("重新连接");
+        }
+
+        @Override
+        public void onSuccess(String s) {
+            Log.e(TAG, "ConnectListener 连接监听" + s);
+            Toast.makeText(MainActivity.this, "连接成功", Toast.LENGTH_SHORT).show();
+            connectBtn.setVisibility(View.INVISIBLE);
+            groupChatBtn.setVisibility(View.VISIBLE);
+            privateChat.setVisibility(View.VISIBLE);
+        }
+
+        @Override
+        public void onError(int i, String s) {
+            Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
+            Toast.makeText(MainActivity.this, s, Toast.LENGTH_SHORT).show();
+            connectBtn.setText("重新连接");
+
+        }
+    };
+
     private void initUI() {
         groupChatBtn = (Button) findViewById(R.id.groupChat);
         privateChat = (Button) findViewById(R.id.privateChat);
+        connectBtn = (Button) findViewById(connect);
         groupChatBtn.setOnClickListener(this);
         privateChat.setOnClickListener(this);
-
+        connectBtn.setOnClickListener(this);
     }
@@ -40,6 +77,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 Intent intent1 = new Intent(MainActivity.this, PrivateChatActivity.class);
                 startActivity(intent1);
                 break;
+            case connect:
+                //调用此方法在聊天室中不切换用户默认为游客
+                // 调用此方法之后不调用断开连接，网络掉线等原因系统会自动重连用户无需处理
+                ChatUtil.connect(connectListener);
+
+
         }
     }
 }
@@ -47,6 +47,9 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private String my_id_editID;
     private LinearLayout my_liner_userID;
     private Handler mHandler;
+    private EditText opposite_name_edit;
+    private EditText my_name_edit;
+    private String my_name_edit1;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,11 +59,12 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         mHandler = new Handler();
         ChatUtil.setConnectStatusListener(connectStatusListener);
         ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
-        ChatUtil.connect(connectListener);
     }
     private void initView() {
+        my_name_edit = (EditText) findViewById(R.id.my_name_edit);
+        opposite_name_edit = (EditText) findViewById(R.id.opposite_name_edit);
         chatListView = (ListView) findViewById(R.id.private_list_view);
         chatListAdapter = new ChatListAdapter(this);
         chatListView.setAdapter(chatListAdapter);
@@ -96,15 +100,20 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                     Toast.makeText(this, "对方ID不能为空", Toast.LENGTH_SHORT).show();
                 } else if (my_id_edit.getText().toString().isEmpty()) {
                     Toast.makeText(this, "你的ID不能为空", Toast.LENGTH_SHORT).show();
+                } else if (my_name_edit.getText().toString().isEmpty()) {
+                    Toast.makeText(this, "你的name不能为空", Toast.LENGTH_SHORT).show();
+                } else if (opposite_name_edit.getText().toString().isEmpty()) {
+                    Toast.makeText(this, "对方name不能为空", Toast.LENGTH_SHORT).show();
                 } else {
                     user_id_edit.getText().toString();
                     oppositeID = user_id_edit.getText().toString();
                     my_id_editID = my_id_edit.getText().toString();
+                    my_name_edit1 = my_name_edit.getText().toString();
                     linearLayoutUseID.setVisibility(View.INVISIBLE);
                     edit_layout.setVisibility(View.VISIBLE);
                     chatListView.setVisibility(View.VISIBLE);
                     my_liner_userID.setVisibility(View.INVISIBLE);
-                    CNUserInfo cnName = new CNUserInfo(my_id_editID, "cnName", "");
+                    CNUserInfo cnName = new CNUserInfo(my_id_editID, my_name_edit1, "");
                     ChatUtil.login(cnName, connectListener);
                 }
@@ -125,7 +134,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         @Override
         public void onSuccess(String s) {
             Log.e(TAG, "ConnectListener 连接监听" + s);
-            Toast.makeText(PrivateChatActivity.this, "连接成功", Toast.LENGTH_SHORT).show();
+            Toast.makeText(PrivateChatActivity.this, s, Toast.LENGTH_SHORT).show();
         }
         @Override
@@ -205,10 +214,5 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
             });
         }
     };
-
-
-
-
-
 }