修改逻辑，修改布局

陈硕
1 parent 0b6ad818
Showing 6 changed files with 263 additions and 74 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/PrivateChatActivity.java
app/src/main/res/drawable/slel_back.xml
app/src/main/res/layout/activity_lin_top.xml
app/src/main/res/layout/activity_private_chat.xml
@@ -49,7 +49,7 @@ public class ChatItemActivity extends AppCompatActivity implements View.OnClickL
                 doIntentChatRoom(ChatRoomActivity.class);
                 break;
             case R.id.private_chat:
-                doIntentPriRoom(PrivateChatActivity.class);
+                doIntentChatRoom(PrivateChatActivity.class);
                 break;
         }
     }
@@ -61,10 +61,4 @@ public class ChatItemActivity extends AppCompatActivity implements View.OnClickL
         intent.putExtra("user_id_string",user_id_string);
         startActivity(intent);
     }
-
-    private void doIntentPriRoom(Class classes) {
-        Intent intent = new Intent();
-        intent.setClass(this, classes);
-        startActivity(intent);
-    }
 }
@@ -65,6 +65,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         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);
+        }else {
+            ChatUtil.logOut(connectListener);
         }
     }
@@ -117,7 +119,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(ChatRoomActivity.this, "发送成功", Toast.LENGTH_SHORT).show();
                     if ((roomIdOne).equals(cnMessage.getTargetId())) {
                         groupChatOneListMy.add(cnMessage);
                         chatListAdapterOne.updateItems(groupChatOneListMy);
@@ -48,6 +48,12 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private EditText opposite_name_edit;
     private String user_name_string;
     private String user_id_string;
+    private int sendInfo = 1;
+    private Button agree_btn;
+    private Button reject_btn;
+    private LinearLayout agree_reject_lin;
+    boolean isCanSendMeaasge = false;
+    private Button vistor_btn;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -57,7 +63,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         mHandler = new Handler();
         ChatUtil.setConnectStatusListener(connectStatusListener);
         ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
-
     }
     private void initView() {
@@ -76,20 +81,40 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         Intent intent = getIntent();
         user_name_string = intent.getStringExtra("user_name_string");
         user_id_string = intent.getStringExtra("user_id_string");
+        agree_btn = (Button) findViewById(R.id.agree_btn);
+        reject_btn = (Button) findViewById(R.id.reject_btn);
+        agree_btn.setOnClickListener(this);
+        reject_btn.setOnClickListener(this);
+        agree_reject_lin = (LinearLayout) findViewById(R.id.agree_reject_lin);
+        vistor_btn = (Button) findViewById(R.id.vistor_Btn);
+        vistor_btn.setOnClickListener(this);
     }
     @Override
     public void onClick(View v) {
+
         switch (v.getId()) {
             case R.id.send_message:
                 //发送私聊消息，需要传入目标ID与发送的消息内容
-                if (messageContent.getText().toString().isEmpty()) {
-                    Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
+                if (sendInfo == 2) {
+                    Toast.makeText(this, "等待对方接受邀请", Toast.LENGTH_SHORT).show();
+
+                } else if (sendInfo == 4) {
+                    Toast.makeText(this, "对方已经拒绝不能发送", Toast.LENGTH_SHORT).show();
+
                 } else {
-                    ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, messageContent.getText().toString(), sendMessageListener);
-                    messageContent.setText("");
+
+                    if (messageContent.getText().toString().isEmpty()) {
+                        Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
+                    } else {
+                        ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, messageContent.getText().toString(), sendMessageListener);
+                        messageContent.setText("");
+                    }
+
+
                 }
+
                 break;
             case R.id.userId_btn_top:
                 //发送私聊消息，需要传入目标ID与发送的消息内容
@@ -98,16 +123,31 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                 } 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();
                     linearLayoutUseID.setVisibility(View.INVISIBLE);
                     edit_layout.setVisibility(View.VISIBLE);
                     chatListView.setVisibility(View.VISIBLE);
                     CNUserInfo cnName = new CNUserInfo(user_id_string, user_name_string, "");
                     ChatUtil.login(cnName, connectListener);
+
                 }
                 break;
+
+            case R.id.agree_btn:
+                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "同意", sendMessageListener);
+                agree_reject_lin.setVisibility(View.GONE);
+                break;
+
+            case R.id.reject_btn:
+                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "拒绝", sendMessageListener);
+                agree_reject_lin.setVisibility(View.GONE);
+                break;
+            case R.id.vistor_Btn:
+                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "你好我们可以进行私聊吗", sendMessageListener);
+
+                break;
         }
     }
@@ -118,6 +158,30 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         public void onTokenIncorrect() {
             Log.e(TAG, "ConnectListener TokenIncorrect");
             Toast.makeText(PrivateChatActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
+            ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "你好我们可以进行私聊吗", sendMessageListener);
+        }
+
+        @Override
+        public void onSuccess(String s) {
+            Log.e(TAG, "ConnectListener 连接监听" + s);
+            Toast.makeText(PrivateChatActivity.this, s, Toast.LENGTH_SHORT).show();
+
+        }
+
+        @Override
+        public void onError(int i, String s) {
+            Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
+            Toast.makeText(PrivateChatActivity.this, s, Toast.LENGTH_SHORT).show();
+
+        }
+    };
+
+
+    private IChat.OnConnectListener connectListener1 = new IChat.OnConnectListener() {
+        @Override
+        public void onTokenIncorrect() {
+            Log.e(TAG, "ConnectListener TokenIncorrect");
+            Toast.makeText(PrivateChatActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
         }
@@ -148,14 +212,25 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         @Override
         public void onSuccess(final CNMessage cnMessage) {
+
+            if(View.VISIBLE==vistor_btn.getVisibility()){
+                vistor_btn.setVisibility(View.GONE);
+            }
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
                     Toast.makeText(PrivateChatActivity.this, "发送消息成功", Toast.LENGTH_SHORT).show();
+                    if (messageList.size() == 0 && cnMessage.getContent().equals("你好我们可以进行私聊吗")) {
+                        sendInfo = 2;
+                        Toast.makeText(PrivateChatActivity.this, "申请已发送等待对方验证", Toast.LENGTH_SHORT).show();
+                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("拒绝")) {
+                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("同意")) {
+                    } else {
+                        messageList.add(cnMessage);
+                        chatListAdapter.updateItems(messageList);
+                        chatListAdapter.notifyDataSetChanged();
+                    }
-                    messageList.add(cnMessage);
-                    chatListAdapter.updateItems(messageList);
-                    chatListAdapter.notifyDataSetChanged();
                 }
             });
@@ -171,7 +246,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                 @Override
                 public void run() {
                     Toast.makeText(PrivateChatActivity.this, "发送消息失败", Toast.LENGTH_SHORT).show();
-
+                    vistor_btn.setText("重新邀请");
                 }
             });
@@ -188,7 +263,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         }
     };
-
+    private boolean isvistor = false;
     //接收消息监听
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
@@ -197,11 +272,25 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    messageList.add(cnMessage);
-                    chatListAdapter.updateItems(messageList);
-                    chatListAdapter.notifyDataSetChanged();
+                    vistor_btn.setVisibility(View.GONE);
+                    if (messageList.size() == 0 && cnMessage.getContent().equals("你好我们可以进行私聊吗")) {
+                        agree_reject_lin.setVisibility(View.VISIBLE);
+                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("拒绝")) {
+                        sendInfo = 4;
+                        Toast.makeText(PrivateChatActivity.this, "对方已经决绝了您", Toast.LENGTH_SHORT).show();
+                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("同意")) {
+                        Toast.makeText(PrivateChatActivity.this, "对方已经同意了您", Toast.LENGTH_SHORT).show();
+                        sendInfo = 5;
+                    } else {
+                        messageList.add(cnMessage);
+                        chatListAdapter.updateItems(messageList);
+                        chatListAdapter.notifyDataSetChanged();
+                    }
+
+
                 }
             });
+
         }
     };
 }
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#55000000" />
+    <corners android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+
+        />
+
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Button" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Button"
+        android:layout_marginRight="41dp"
+        android:layout_marginEnd="41dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+</RelativeLayout>
 \ No newline at end of file
@@ -4,88 +4,159 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <ListView
-        android:id="@+id/private_list_view"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="300dp"
-        android:divider="@null"
-        android:scrollbars="none"
-        android:transcriptMode="alwaysScroll"
-        android:visibility="invisible" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+        <ListView
+            android:id="@+id/private_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:divider="@null"
+            android:scrollbars="none"
+            android:transcriptMode="alwaysScroll"
+            android:visibility="invisible" />
+    </LinearLayout>
     <LinearLayout
         android:id="@+id/edit_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:visibility="invisible">
-        <EditText
-            android:id="@+id/message_content"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.7" />
         <Button
-            android:id="@+id/send_message"
-            android:layout_width="0dp"
+            android:id="@+id/vistor_Btn"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.2"
-            android:text="发送" />
-    </LinearLayout>
+            android:text="邀请对方聊天" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <EditText
+                android:id="@+id/message_content"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0.7" />
+            <Button
+                android:id="@+id/send_message"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0.2"
+                android:text="发送" />
+        </LinearLayout>
+    </LinearLayout>
     <LinearLayout
         android:id="@+id/opposite_liner_useID"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="horizontal">
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:orientation="vertical">
-        <TextView
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             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/opposite_id_edit"
-            android:layout_width="0dp"
+            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/opposite_id_edit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <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/opposite_name_edit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/userId_btn_top"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_weight="1" />
+            android:text="确定" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/agree_reject_lin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:background="@drawable/slel_back"
+        android:orientation="vertical"
+        android:visibility="invisible">
+
         <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/opposite_name_edit"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"/>
+            android:text="有人请求和您进行私聊"
+            android:gravity="center"/>
-        <Button
-            android:id="@+id/userId_btn_top"
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="完成" />
+            android:layout_height="wrap_content">
-    </LinearLayout>
+            <Button
+                android:id="@+id/agree_btn"
+                android:background="#00000000"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="同意" />
+            <Button
+                android:id="@+id/reject_btn"
+                android:background="#00000000"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="拒绝" />
+        </LinearLayout>
+    </LinearLayout>
 </RelativeLayout>