更新SDK 并显示聊天历史

朱显松
1 parent 48faa6ab
Showing 3 changed files with 19 additions and 22 deletions
app/libs/libcnliveutil.jar
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/res/layout/activity_groupchat.xml
@@ -333,7 +333,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 }
                 break;
             case R.id.creatChat:
-                ChatUtil.joinChatRoom(roomIdOne, -1, onOperationListener);
+                ChatUtil.joinChatRoom(roomIdOne, 20, onOperationListener);
                 break;
             case R.id.exit_chat1:
                 ChatUtil.quitChatRoom(roomIdOne, onOperationListener);
@@ -11,32 +11,28 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:visibility="visible"
-        android:clickable="true">
+        android:clickable="true"
+        android:visibility="visible">
         <LinearLayout
             android:id="@+id/listVIewTop"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/buttons"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:orientation="horizontal">
-            <LinearLayout
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/chat_list_viewOne"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/chat_list_viewOne"
-                    android:layout_width="fill_parent"
-                    android:layout_height="200dp"
-                    android:layout_above="@+id/edit_layout"
-                    android:divider="@null"
-                    android:fastScrollEnabled="true"
-                    android:scrollbars="none" />
-            </LinearLayout>
+                android:layout_above="@+id/edit_layout"
+                android:divider="@null"
+                android:fastScrollEnabled="true"
+                android:scrollbars="none" />
         </LinearLayout>
         <LinearLayout
@@ -78,7 +74,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_weight="0.1"
                 android:src="@drawable/pic"
-                android:visibility="visible"/>
+                android:visibility="visible" />
             <Button
                 android:id="@+id/send_messageOne"
@@ -87,11 +83,12 @@
                 android:layout_gravity="center"
                 android:layout_weight="0.2"
                 android:text="发送"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </LinearLayout>
         <LinearLayout
+            android:id="@+id/buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_above="@id/edit_layout"
@@ -109,10 +106,10 @@
                     android:text="加入聊天室" />
                 <!--<Button-->
-                    <!--android:id="@+id/ima_send"-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:text="图片" />-->
+                <!--android:id="@+id/ima_send"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:text="图片" />-->
                 <Button
                     android:id="@+id/exit_chat1"