修改布局，添加修改逻辑

陈硕
1 parent 8b6a7deb
Showing 6 changed files with 89 additions and 113 deletions
app/src/main/java/com/cnlive/im/ui/ChatItemActivity.java
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/LoGinActivity.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_user.xml
-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 com.cnlive.im.R;
-
-
-/**
- * @author 陈硕
- * @time 2017/3/20  10:32
- * @desc ${TODD}
- */
-public class ChatItemActivity extends AppCompatActivity implements View.OnClickListener {
-
-    private Button grounp_chat, private_chat;
-    private String user_name_string;
-    private String user_id_string;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_chat_item);
-        intUI();
-
-    }
-
-    private void intUI() {
-        grounp_chat = (Button) findViewById(R.id.grounp_chat);
-        private_chat = (Button) findViewById(R.id.private_chat);
-        grounp_chat.setOnClickListener(this);
-        private_chat.setOnClickListener(this);
-        Intent intent = getIntent();
-        user_name_string = intent.getStringExtra("user_name_string");
-        user_id_string = intent.getStringExtra("user_id_string");
-
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.grounp_chat:
-                doIntentChatRoom(ChatRoomActivity.class);
-                break;
-            case R.id.private_chat:
-                doIntentChatRoom(PrivateChatActivity.class);
-                break;
-        }
-    }
-
-    private void doIntentChatRoom(Class classes) {
-        Intent intent = new Intent();
-        intent.setClass(this, classes);
-        intent.putExtra("user_name_string",user_name_string);
-        intent.putExtra("user_id_string",user_id_string);
-        startActivity(intent);
-    }
-}
@@ -52,8 +52,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private Button exit_chat1;
     private Button chat_info_mationBtn;
     public static String user_name_string;
-    int i=0;
-    private  boolean isUserLogin=false;
+    int i = 0;
+    private boolean isUserLogin = false;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -70,9 +70,9 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         Intent intent = getIntent();
         user_name_string = intent.getStringExtra("user_name_string");
         String user_id_string = intent.getStringExtra("user_id_string");
-        if (user_name_string != null) {
+        if (user_name_string != null)
             ChatUtil.login(new CNUserInfo(user_id_string, user_name_string, ""), connectListener);
-        }
+        else ChatUtil.logOut(connectListener);
     }
@@ -107,6 +107,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         public void onAttached(CNMessage cnMessage) {
             Log.v(TAG, "SendMessageListener onAttached" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName());
         }
+
         @Override
         public void onSuccess(final CNMessage cnMessage) {
             mHandler.post(new Runnable() {
@@ -128,6 +129,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             });
         }
+
         @Override
         public void onError(CNMessage cnMessage, int i, final String s) {
             Log.v(TAG, "SendMessageListener 失败 " + i + "    s" + s);
@@ -160,7 +162,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                         JSONObject jsonObject = new JSONObject(cnMessage.getContent().toString());
                         String type = (String) jsonObject.get("type");
                         if ("2".equals(type)) {
-                            Toast.makeText(ChatRoomActivity.this, cnMessage.getUserInfo().getUserName()+"加入聊天室", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(ChatRoomActivity.this, cnMessage.getUserInfo().getUserName() + "加入聊天室", Toast.LENGTH_SHORT).show();
                             return;
                         }
                     } catch (JSONException e) {
@@ -183,14 +185,17 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         public void onJoining(String s) {
             Log.i(TAG, "chatRoomActionListener" + "   onJoining" + s);
         }
+
         @Override
         public void onJoined(String s) {
             Log.i(TAG, "chatRoomActionListener     " + "onJoined" + s);
         }
+
         @Override
         public void onQuited(String s) {
             Log.i(TAG, "chatRoomActionListener     " + "onQuited" + s);
         }
+
         @Override
         public void onError(String s, int i, String s1) {
             Log.i(TAG, "chatRoomActionListener     " + "onError" + s);
@@ -210,6 +215,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 }
             });
         }
+
         @Override
         public void conByDevId(final int what, final String extra) {
             Log.e(TAG, what + " : " + extra);
@@ -232,7 +238,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    if(i==0){
+                    if (i == 0) {
                         String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole(user_name_string + "加入聊天室", "2"));
                         ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, objToJsonString, sendMessageListener);
                         ++i;
@@ -299,6 +305,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         public void onTokenIncorrect() {
             Log.e(TAG, "ConnectListener TokenIncorrect");
             Toast.makeText(ChatRoomActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
+            finish();
         }
@@ -313,16 +320,12 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         public void onError(int i, String s) {
             Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
             Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
+            finish();
         }
     };
-
-
-
-
-
     public static class CNMessageInfo {
         CNMessage cnMessage;
         boolean sendMesageInfo;
@@ -9,7 +9,6 @@ import android.widget.Button;
 import com.cnlive.im.R;
 import com.cnlive.libs.util.chat.ChatUtil;
-import com.cnlive.libs.util.chat.base.IChat;
 /**
  * @author 陈硕
@@ -56,19 +55,4 @@ public class LoGinActivity extends AppCompatActivity implements View.OnClickList
     }
-    IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
-        @Override
-        public void onTokenIncorrect() {
-        }
-
-        @Override
-        public void onSuccess(String s) {
-        }
-
-        @Override
-        public void onError(int i, String s) {
-
-        }
-    };
-
 }
@@ -218,7 +218,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                             Toast.makeText(PrivateChatActivity.this, "申请已发送等待对方验证", Toast.LENGTH_SHORT).show();
                         } else if ("3".equals(type) && message.equals("拒绝")) {
                         } else if ("3".equals(type) && message.equals("同意")) {
-                        } else if("4".equals(type)) {
+                        } else if ("4".equals(type)) {
                             messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage, true));
                             chatListAdapter.updateItems(messageList);
                             chatListAdapter.notifyDataSetChanged();
@@ -280,8 +280,8 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                             sendInfo = 1;
                         } else if ("3".equals(type) && "拒绝".equals(jsonObject.get("message"))) {
                             sendInfo = 4;
-                        }else if("4".equals(type) ){
-                            Log.v(TAG,cnMessage.getContent().toString());
+                        } else if ("4".equals(type)) {
+                            Log.v(TAG, cnMessage.getContent().toString());
                             messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage, false));
                             chatListAdapter.updateItems(messageList);
                             chatListAdapter.notifyDataSetChanged();
@@ -17,11 +17,13 @@ import com.cnlive.im.R;
  * @time 2017/3/16  18:29
  * @desc ${TODD}
  */
-public class UserLoginActivity  extends AppCompatActivity  implements View.OnClickListener {
+public class UserLoginActivity extends AppCompatActivity implements View.OnClickListener {
     private EditText user_name;
     private EditText user_id;
-    private Button userBtn;
+    private Button group_chatBtn, private_chatBtn;
+    private String user_name_string;
+    private String user_id_string;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -34,24 +36,44 @@ public class UserLoginActivity  extends AppCompatActivity  implements View.OnCli
     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);
+        group_chatBtn = (Button) findViewById(R.id.group_chat);
+        group_chatBtn.setOnClickListener(this);
+        private_chatBtn = (Button) findViewById(R.id.private_chat);
+        private_chatBtn.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);
+        switch (v.getId()) {
+            case R.id.group_chat:
+                doIntentChatRoom(ChatRoomActivity.class);
+                break;
+            case R.id.private_chat:
+                doIntentChatRoom(PrivateChatActivity.class);
+
+                break;
+        }
+
+    }
+
+
+    private void doIntentChatRoom(Class classes) {
+        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 {
+            user_name_string = user_name.getText().toString();
+            user_id_string = user_id.getText().toString();
+            Intent intent = new Intent();
+            intent.setClass(this, classes);
+            intent.putExtra("user_name_string", user_name_string);
+            intent.putExtra("user_id_string", user_id_string);
             startActivity(intent);
         }
+
+
     }
+
 }
@@ -4,10 +4,13 @@
     android:layout_height="match_parent">
     <LinearLayout
+        android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
         <LinearLayout
             android:layout_width="match_parent"
@@ -44,11 +47,38 @@
                 android:layout_weight="1" />
         </LinearLayout>
-        <Button
-            android:id="@+id/uconnect"
-            android:layout_width="match_parent"
+
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="连接" />
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/group_chat"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="群聊"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginLeft="60dp"
+                android:layout_marginStart="60dp" />
+
+            <Button
+                android:id="@+id/private_chat"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="私聊"
+                android:layout_marginRight="65dp"
+                android:layout_marginEnd="65dp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true" />
+
+        </RelativeLayout>
+
+
     </LinearLayout>