修改整体逻辑

陈硕
1 parent d0078183
Showing 8 changed files with 147 additions and 260 deletions
app/src/main/AndroidManifest.xml
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
app/src/main/java/com/cnlive/im/ui/UserLoginActivity.java
app/src/main/res/layout/activity_groupchat.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_private_chat.xml
@@ -41,14 +41,33 @@
             >
         </activity>
+        <activity
+            android:name="com.cnlive.im.ui.LoGinActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
         <activity
+            android:name=".ui.UserLoginActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+        <activity
             android:name="com.cnlive.im.ui.PrivateChatActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+        <activity
+            android:name=".ui.ChatItemActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+
         <service
             android:name="io.rong.imlib.ipc.RongService"
             android:exported="true"
 package com.cnlive.im.ui;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -36,12 +37,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private ListView listViewOne;
     private ChatListAdapter chatListAdapterOne, chatListAdapterTwo;
     private ListView listViewTwo;
-    private Button user_switchBtn, foundChatBtn;
+    private Button  foundChatBtn;
     private Button creatChat2Btn;
     private Handler mHandler;
     private RelativeLayout re_chat;
     private LinearLayout lin_user;
-    private Button user_imfor_send;
     private EditText user_id, user_name;
     private CNUserInfo cnUser;
     private Button exit_chat2;
@@ -60,6 +60,12 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         ChatUtil.setOnChatRoomActionListener(chatRoomActionListener);
         ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
         ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
+        Intent intent = getIntent();
+        String user_name_string = intent.getStringExtra("user_name_string");
+        String user_id_string = intent.getStringExtra("user_id_string");
+        if(user_name_string!=null){
+            ChatUtil.login(new CNUserInfo(user_id_string,user_name_string,""),connectListener);
+        }
     }
@@ -68,12 +74,10 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         exit_chat1 = (Button) findViewById(R.id.exit_chat1);
         user_id = (EditText) findViewById(R.id.user_ID);
         user_name = (EditText) findViewById(R.id.user_name);
-        user_imfor_send = (Button) findViewById(R.id.user_imfor_send);
         lin_user = (LinearLayout) findViewById(R.id.lin_user);
         re_chat = (RelativeLayout) findViewById(R.id.re_chat);
         creatChat2Btn = (Button) findViewById(R.id.creatChat2);
         foundChatBtn = (Button) findViewById(R.id.creatChat);
-        user_switchBtn = (Button) findViewById(R.id.user_switch);
         listViewOne = (ListView) findViewById(R.id.chat_list_viewOne);
         listViewTwo = (ListView) findViewById(R.id.chat_list_viewTwo);
         editText = (EditText) findViewById(R.id.message_content);
@@ -81,11 +85,9 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         send_messageOneTwo = (Button) findViewById(R.id.send_messageTwo);
         exit_chat1.setOnClickListener(this);
         exit_chat2.setOnClickListener(this);
-        user_imfor_send.setOnClickListener(this);
         foundChatBtn.setOnClickListener(this);
         send_messageOneBtn.setOnClickListener(this);
         send_messageOneTwo.setOnClickListener(this);
-        user_switchBtn.setOnClickListener(this);
         creatChat2Btn.setOnClickListener(this);
         groupChatOneListMy = new ArrayList<>();
         groupChatTwoListMy = new ArrayList<>();
@@ -96,29 +98,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     }
-    //连接监听
-    private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
-        @Override
-        public void onTokenIncorrect() {
-            Log.e(TAG, "ConnectListener TokenIncorrect");
-            Toast.makeText(ChatRoomActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
-
-        }
-
-        @Override
-        public void onSuccess(String s) {
-            Log.e(TAG, "ConnectListener 连接监听" + s);
-            //Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
-        }
-
-        @Override
-        public void onError(int i, String s) {
-            Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
-            Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
-
-        }
-    };
-
     /**
      * 发送消息监听
@@ -139,8 +118,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 @Override
                 public void run() {
                     Toast.makeText(ChatRoomActivity.this, "发送成功", Toast.LENGTH_SHORT).show();
-
-                    if (("60_" + roomIdOne).equals(cnMessage.getTargetId())) {
+                    if ((roomIdOne).equals(cnMessage.getTargetId())) {
                         groupChatOneListMy.add(cnMessage);
                         chatListAdapterOne.updateItems(groupChatOneListMy);
                         chatListAdapterOne.notifyDataSetChanged();
@@ -150,7 +128,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     /**
                      * 连接两个聊天室30015 错误
                      */
-                    if (("60_" + roomIdTwo).equals(cnMessage.getTargetId())) {
+                    if ((roomIdTwo).equals(cnMessage.getTargetId())) {
                         groupChatTwoListMy.add(cnMessage);
                         chatListAdapterTwo.updateItems(groupChatTwoListMy);
                         chatListAdapterTwo.notifyDataSetChanged();
@@ -194,7 +172,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    if (("60_" + roomIdOne).equals(cnMessage.getTargetId())) {
+                    if (( roomIdOne).equals(cnMessage.getTargetId())) {
                         groupChatOneListMy.add(cnMessage);
                         chatListAdapterOne.updateItems(groupChatOneListMy);
                         chatListAdapterOne.notifyDataSetChanged();
@@ -204,7 +182,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     /**
                      * 连接两个聊天室30015 错误
                      */
-                    if (("60_" + roomIdTwo).equals(cnMessage.getTargetId())) {
+                    if (( roomIdTwo).equals(cnMessage.getTargetId())) {
                         groupChatTwoListMy.add(cnMessage);
                         chatListAdapterTwo.updateItems(groupChatTwoListMy);
                         chatListAdapterTwo.notifyDataSetChanged();
@@ -317,17 +295,12 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     editText.setText("");
                 }
                 break;
-            // 用户
-            case R.id.user_switch:
-                re_chat.setVisibility(View.INVISIBLE);
-                lin_user.setVisibility(View.VISIBLE);
-                break;
-            // 创建聊天
+
             case R.id.creatChat:
                 ChatUtil.joinChatRoom(roomIdOne, -1, onOperationListener);
-            //加入聊天室2
+                //加入聊天室2
             case R.id.creatChat2:
-                ChatUtil.joinChatRoom(roomIdTwo, -1, onOperationListener);
+               // ChatUtil.joinChatRoom(roomIdTwo, -1, onOperationListener);
                 break;
             case R.id.exit_chat2:
@@ -338,21 +311,33 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 ChatUtil.quitChatRoom(roomIdOne, onOperationListener);
                 break;
-
-            case R.id.user_imfor_send:
-                if (user_id.getText().toString().isEmpty())
-                    Toast.makeText(ChatRoomActivity.this, "用户id不能为空", Toast.LENGTH_SHORT).show();
-                else if (user_name.getText().toString().isEmpty())
-                    Toast.makeText(ChatRoomActivity.this, "用户名不能为空", Toast.LENGTH_SHORT).show();
-                else {
-                    cnUser = new CNUserInfo(user_id.getText().toString(), user_name.getText().toString(), "");
-                    ChatUtil.login(cnUser, connectListener);
-                    re_chat.setVisibility(View.VISIBLE);
-                    lin_user.setVisibility(View.INVISIBLE);
-                }
-                break;
         }
     }
+
+
+    private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
+        @Override
+        public void onTokenIncorrect() {
+            Log.e(TAG, "ConnectListener TokenIncorrect");
+            Toast.makeText(ChatRoomActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
+
+        }
+
+        @Override
+        public void onSuccess(String s) {
+            Log.e(TAG, "ConnectListener 连接监听" + s);
+            Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void onError(int i, String s) {
+            Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
+            Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
+
+        }
+    };
+
+
 }
@@ -3,24 +3,18 @@ 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;
+
+    private Button connectedBtn;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,60 +23,35 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         initUI();
     }
-    //连接监听
-    private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
+    private void initUI() {
+        connectedBtn = (Button) findViewById(R.id.connected);
+        connectedBtn.setOnClickListener(this);
+    }
+
+
+
+    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("重新连接");
+            connectedBtn.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);
+            Intent intent = new Intent(MainActivity.this,LoGinActivity.class);
+            startActivity(intent);
         }
         @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("重新连接");
+            connectedBtn.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);
-    }
-
-
     @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.groupChat:
-                Intent intent = new Intent(MainActivity.this, ChatRoomActivity.class);
-                startActivity(intent);
-                break;
-            case R.id.privateChat:
-                Intent intent1 = new Intent(MainActivity.this, PrivateChatActivity.class);
-                startActivity(intent1);
-                break;
-            case connect:
-                //调用此方法在聊天室中不切换用户默认为游客
-                //调用此方法之后不调用断开连接，网络掉线等原因系统会自动重连用户无需处理
-                ChatUtil.connect(connectListener);
-
-        }
+    public void onClick(View v) {
+        ChatUtil.connect(connectListener);
     }
 }
 package com.cnlive.im.ui;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -43,13 +44,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private Button userId_btn_top;
     private String oppositeID;
     private LinearLayout edit_layout;
-    private EditText my_id_edit;
-    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;
+    private String user_name_string;
+    private String user_id_string;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -63,7 +61,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     }
     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);
@@ -75,10 +72,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         userId_btn_top = (Button) findViewById(R.id.userId_btn_top);
         userId_btn_top.setOnClickListener(this);
         edit_layout = (LinearLayout) findViewById(R.id.edit_layout);
-        my_id_edit = (EditText) findViewById(R.id.my_id_edit);
         user_id_edit = (EditText) findViewById(opposite_id_edit);
-        my_liner_userID = (LinearLayout) findViewById(R.id.my_liner_userID);
-
+        Intent intent = getIntent();
+        user_name_string = intent.getStringExtra("user_name_string");
+        user_id_string = intent.getStringExtra("user_id_string");
     }
@@ -98,22 +95,15 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                 //发送私聊消息，需要传入目标ID与发送的消息内容
                 if (user_id_edit.getText().toString().isEmpty()) {
                     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, my_name_edit1, "");
+                    CNUserInfo cnName = new CNUserInfo(user_id_string, user_name_string, "");
                     ChatUtil.login(cnName, connectListener);
                 }
+package com.cnlive.im.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.cnlive.im.R;
+
+
+/**
+ * @author 陈硕
+ * @time 2017/3/16  18:29
+ * @desc ${TODD}
+ */
+public class UserLoginActivity  extends AppCompatActivity  implements View.OnClickListener {
+
+    private EditText user_name;
+    private EditText user_id;
+    private Button userBtn;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_user);
+        intUI();
+    }
+
+    private void intUI() {
+        user_name = (EditText) findViewById(R.id.user_name);
+        user_id = (EditText) findViewById(R.id.user_ID);
+        userBtn = (Button) findViewById(R.id.uconnect);
+        userBtn.setOnClickListener(this);
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        if(user_id.getText().toString().isEmpty()){
+            Toast.makeText(UserLoginActivity.this,"id不能为空",Toast.LENGTH_SHORT).show();
+        }else if(user_name.getText().toString().isEmpty()){
+            Toast.makeText(UserLoginActivity.this,"用户名不能为空",Toast.LENGTH_SHORT).show();
+        }else {
+            String user_name_string = user_name.getText().toString();
+            String user_id_string = user_id.getText().toString();
+            Intent intent = new Intent(UserLoginActivity.this, ChatItemActivity.class);
+            intent.putExtra("user_name_string",user_name_string);
+            intent.putExtra("user_id_string",user_id_string);
+            startActivity(intent);
+        }
+    }
+}
@@ -154,77 +154,14 @@
                     android:layout_height="wrap_content"
                     android:text="退出聊天室2" />
-                <Button
-                    android:id="@+id/user_switch"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="切换用户" />
+
             </LinearLayout>
         </LinearLayout>
     </RelativeLayout>
-    <LinearLayout
-        android:id="@+id/lin_user"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:orientation="vertical"
-        android:visibility="invisible">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="userID  :" />
-
-            <EditText
-                android:id="@+id/user_ID"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.7" />
-
-            <Button
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:text="确认"
-                android:visibility="invisible" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="userName:" />
-
-            <EditText
-                android:id="@+id/user_name"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.7" />
-
-            <Button
-                android:id="@+id/user_imfor_send"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:text="确认" />
-        </LinearLayout>
-    </LinearLayout>
 </RelativeLayout>
@@ -4,37 +4,14 @@
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.cnlive.im.ui.MainActivity">
-
-    <Button
-        android:visibility="invisible"
-        android:id="@+id/groupChat"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="140dp"
-        android:text="群聊" />
-
-    <Button
-        android:visibility="invisible"
-        android:id="@+id/privateChat"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/groupChat"
-        android:layout_marginTop="34dp"
-        android:text="私聊" />
-
-    <Button
-        android:id="@+id/connect"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/privateChat"
-        android:layout_marginTop="36dp"
-        android:text="连接服务器" />
-
+   <Button
+       android:id="@+id/connected"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content"
+       android:layout_centerInParent="true"
+       android:text="连接"
+        />
 </RelativeLayout>
@@ -85,54 +85,7 @@
             android:text="完成" />
     </LinearLayout>
-    <LinearLayout
-        android:id="@+id/my_liner_userID"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/opposite_liner_useID"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="我的id :"
-            android:textSize="22dp"
-            android:textStyle="bold" />
-
-        <EditText
-            android:id="@+id/my_id_edit"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.5" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="name:"
-            android:textSize="22dp"
-            android:textStyle="bold" />
-
-        <EditText
-            android:id="@+id/my_name_edit"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.5" />
-
-        <Button
-            android:id="@+id/my_btn_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="完成"
-            android:visibility="invisible" />
-
-    </LinearLayout>
 </RelativeLayout>