添加用户输入布局

陈硕
1 parent 12ab30a5
Showing 9 changed files with 331 additions and 124 deletions
.idea/modules.xml
app/build.gradle
app/doc/聊天SDK文档.docx
app/proguard-rules.pro
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
app/src/main/res/layout/activity_groupchat.xml
app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,6 @@
       <module fileurl="file://$PROJECT_DIR$/CNChatNDemo.iml" filepath="$PROJECT_DIR$/CNChatNDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/CNIMDemo.iml" filepath="$PROJECT_DIR$/CNIMDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
@@ -13,8 +13,14 @@ android {
     }
     buildTypes {
         release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+        }
+        debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable true
         }
     }
 }
+# 通用混淆配置
+#不混淆泛型 -keepattributes SourceFile
+-keepattributes Signature,InnerClasses,Exceptions,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
+
+ -optimizationpasses 5
+ -dontusemixedcaseclassnames
+ -dontskipnonpubliclibraryclasses
+ -dontpreverify
+ -verbose
+ -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+ #忽略警告 也可以用-ignorewarnings
+ -dontwarn
+
+ -keep public class * extends android.app.Activity
+ -keep public class * extends android.app.Application
+ -keep public class * extends android.app.Service
+ -keep public class * extends android.content.BroadcastReceiver
+ -keep public class * extends android.content.ContentProvider
+ -keep public class * extends android.app.backup.BackupAgentHelper
+ -keep public class * extends android.preference.Preference
+ -keep public class com.android.vending.licensing.ILicensingService
+
+ -keepclasseswithmembernames class * {
+     native <methods>;
+ }
+
+ -keepclasseswithmembers class * {
+     public <init>(android.content.Context, android.util.AttributeSet);
+ }
+
+ -keepclasseswithmembers class * {
+     public <init>(android.content.Context, android.util.AttributeSet, int);
+ }
+
+ -keepclassmembers class * extends android.app.Activity {
+     public void *(android.view.View);
+ }
+
+ -keepclassmembers enum * {
+     public static **[] values();
+     public static ** valueOf(java.lang.String);
+ }
+
+ -keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+ }
+
+
+
+-dontwarn com.cnlive.libs.util.**
+ -keep class com.cnlive.libs.util. { *;}
+
+
+
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in D:\AndroidSDK/tools/proguard/proguard-android.txt
@@ -36,7 +36,10 @@
             android:name="com.cnlive.im.ui.ChatRoomActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            >
+        </activity>
         <activity
@@ -44,7 +47,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
         <service
             android:name="io.rong.imlib.ipc.RongService"
@@ -7,7 +7,9 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 import com.cnlive.im.R;
@@ -37,11 +39,17 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private Button user_switchBtn, reconnectionBtn, switch_visitorsBtn, foundChatBtn, disconnectBtn;
     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;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //取消状态栏
         setContentView(R.layout.activity_groupchat);
         initUI();
         //设置监听
@@ -54,6 +62,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private void initUI() {
+        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);
         disconnectBtn = (Button) findViewById(R.id.disconnect);
         foundChatBtn = (Button) findViewById(R.id.creatChat);
@@ -65,6 +78,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         editText = (EditText) findViewById(R.id.message_content);
         send_messageOneBtn = (Button) findViewById(R.id.send_messageOne);
         send_messageOneTwo = (Button) findViewById(R.id.send_messageTwo);
+        user_imfor_send.setOnClickListener(this);
         disconnectBtn.setOnClickListener(this);
         foundChatBtn.setOnClickListener(this);
         send_messageOneBtn.setOnClickListener(this);
@@ -292,7 +306,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 break;
             // 用户
             case R.id.user_switch:
-                ChatUtil.login(new CNUserInfo("5969", "testUser", ""), connectListener);
+                ChatUtil.login(cnUser, connectListener);
                 break;
             //连接
             case R.id.connectionBtn:
@@ -311,14 +325,27 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 break;
             //  断开连接
             case R.id.disconnect:
-                ChatUtil.disconnect(true);
+                ChatUtil.disconnect(false);
                 break;
-
+            //加入聊天室2
             case R.id.creatChat2:
                 ChatUtil.joinChatRoom(roomIdTwo, -1, 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(), "");
+                    lin_user.setVisibility(View.INVISIBLE);
+                    re_chat.setVisibility(View.VISIBLE);
+                }
+                break;
+
+
         }
     }
@@ -211,7 +211,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     @Override
     protected void onPause() {
         super.onPause();
-        ChatUtil.disconnect(true);
+        ChatUtil.disconnect(false);
     }
@@ -2,127 +2,246 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/activity_chat_room"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
- >
+    android:layout_height="match_parent">
-    <LinearLayout
-        android:id="@+id/listVIewTop"
+    <RelativeLayout
+        android:id="@+id/re_chat"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
-
-        <ListView
-            android:id="@+id/chat_list_viewOne"
-            android:layout_width="0dp"
-            android:layout_height="150dp"
-            android:layout_above="@+id/edit_layout"
-            android:layout_alignParentTop="true"
-            android:layout_weight="1"
-            android:divider="@null"
-            android:scrollbars="none"
-            android:transcriptMode="alwaysScroll" />
-
-        <ListView
-            android:id="@+id/chat_list_viewTwo"
-            android:layout_width="0dp"
-            android:layout_height="150dp"
-            android:layout_above="@+id/edit_layout"
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@id/chat_list_viewOne"
-            android:layout_weight="1"
-            android:divider="@null"
-            android:scrollbars="none"
-            android:transcriptMode="alwaysScroll" />
+        android:layout_height="match_parent"
+        android:visibility="invisible">
-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/listVIewTop"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="聊天室一" />
+
+                <ListView
+                    android:id="@+id/chat_list_viewOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="150dp"
+                    android:layout_above="@+id/edit_layout"
+                    android:layout_alignParentTop="true"
+                    android:divider="@null"
+                    android:scrollbars="none"
+                    android:transcriptMode="alwaysScroll" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="聊天室二" />
+
+                <ListView
+                    android:id="@+id/chat_list_viewTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="150dp"
+                    android:layout_above="@+id/edit_layout"
+                    android:layout_alignParentTop="true"
+                    android:layout_toRightOf="@id/chat_list_viewOne"
+                    android:divider="@null"
+                    android:scrollbars="none"
+                    android:transcriptMode="alwaysScroll" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/edit_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            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_messageOne"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0.2"
+                android:text="聊天室1发送" />
+
+
+            <Button
+                android:id="@+id/send_messageTwo"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0.2"
+                android:text="聊天室2发送" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/edit_layout"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/connectionBtn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="连接服务器" />
+
+                <Button
+                    android:id="@+id/disconnect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="断开连接" />
+
+                <Button
+                    android:id="@+id/creatChat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="加入聊天室1" />
+
+                <Button
+                    android:id="@+id/creatChat2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="加入聊天室2" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/user_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="切换用户" />
+
+                <Button
+                    android:id="@+id/switch_visitors"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="切换游客" />
+
+                <Button
+                    android:id="@+id/button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="退出聊天室2" />
+
+                <Button
+                    android:id="@+id/button2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="退出聊天室1" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
-    <Button
-        android:id="@+id/user_switch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="切换用户"
-        android:layout_above="@+id/edit_layout"
-        android:layout_alignParentStart="true" />
     <LinearLayout
-        android:id="@+id/edit_layout"
+        android:id="@+id/lin_user"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        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" />
+        android:layout_centerVertical="true"
+        android:orientation="vertical">
+
+
+        <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>
-        <Button
-            android:id="@+id/send_messageOne"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.2"
-            android:text="聊天室1发送" />
-
-
-        <Button
-            android:id="@+id/send_messageTwo"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.2"
-            android:text="聊天室2发送" />
     </LinearLayout>
-    <Button
-        android:id="@+id/connectionBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="连接服务器"
-        android:layout_above="@+id/user_switch"
-        android:layout_alignParentStart="true" />
-
-    <Button
-        android:id="@+id/switch_visitors"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="切换游客"
-        android:layout_alignBaseline="@+id/user_switch"
-        android:layout_alignBottom="@+id/user_switch"
-        android:layout_toEndOf="@+id/user_switch" />
-
-    <Button
-        android:id="@+id/creatChat"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="加入聊天室1"
-        android:layout_alignBaseline="@+id/creatChat2"
-        android:layout_alignBottom="@+id/creatChat2"
-        android:layout_toRightOf="@+id/connectionBtn" />
-
-    <Button
-        android:id="@+id/disconnect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="断开连接"
-        android:layout_marginLeft="11dp"
-        android:layout_above="@+id/edit_layout"
-        android:layout_toEndOf="@+id/switch_visitors" />
-
-    <Button
-        android:id="@+id/creatChat2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="加入聊天室2"
-        android:layout_alignBaseline="@+id/connectionBtn"
-        android:layout_alignBottom="@+id/connectionBtn"
-        android:layout_toRightOf="@+id/creatChat"
-        android:layout_toEndOf="@+id/creatChat" />
-
 </RelativeLayout>
@@ -13,20 +13,18 @@
     <Button
         android:text="群聊"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="140dp"
         android:id="@+id/groupChat"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentStart="true" />
+       />
     <Button
         android:text="私聊"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/groupChat"
-        android:layout_alignStart="@+id/groupChat"
         android:layout_marginTop="34dp"
         android:id="@+id/privateChat"
-        android:layout_alignParentEnd="true" />
+         />
 </RelativeLayout>