Commit ad9bcc4a6118710edcc2b793998d8280b66ad742
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNIMDemo
Showing
1 changed file
with
5 additions
and
9 deletions
app/src/main/res/layout/activity_groupchat.xml
| ... | ... | @@ -44,8 +44,7 @@ |
| 44 | 44 | android:layout_width="wrap_content" |
| 45 | 45 | android:layout_height="wrap_content" |
| 46 | 46 | android:text="切换用户" |
| 47 | - android:layout_below="@+id/creatChat2" | |
| 48 | - android:layout_alignParentLeft="true" | |
| 47 | + android:layout_above="@+id/edit_layout" | |
| 49 | 48 | android:layout_alignParentStart="true" /> |
| 50 | 49 | |
| 51 | 50 | <LinearLayout |
| ... | ... | @@ -85,8 +84,7 @@ |
| 85 | 84 | android:layout_width="wrap_content" |
| 86 | 85 | android:layout_height="wrap_content" |
| 87 | 86 | android:text="连接服务器" |
| 88 | - android:layout_below="@+id/listVIewTop" | |
| 89 | - android:layout_alignParentLeft="true" | |
| 87 | + android:layout_above="@+id/user_switch" | |
| 90 | 88 | android:layout_alignParentStart="true" /> |
| 91 | 89 | |
| 92 | 90 | <Button |
| ... | ... | @@ -94,8 +92,8 @@ |
| 94 | 92 | android:layout_width="wrap_content" |
| 95 | 93 | android:layout_height="wrap_content" |
| 96 | 94 | android:text="切换游客" |
| 97 | - android:layout_below="@+id/creatChat" | |
| 98 | - android:layout_toRightOf="@+id/user_switch" | |
| 95 | + android:layout_alignBaseline="@+id/user_switch" | |
| 96 | + android:layout_alignBottom="@+id/user_switch" | |
| 99 | 97 | android:layout_toEndOf="@+id/user_switch" /> |
| 100 | 98 | |
| 101 | 99 | <Button |
| ... | ... | @@ -113,9 +111,7 @@ |
| 113 | 111 | android:layout_height="wrap_content" |
| 114 | 112 | android:text="断开连接" |
| 115 | 113 | android:layout_marginLeft="11dp" |
| 116 | - android:layout_marginStart="11dp" | |
| 117 | - android:layout_below="@+id/creatChat2" | |
| 118 | - android:layout_toRightOf="@+id/switch_visitors" | |
| 114 | + android:layout_above="@+id/edit_layout" | |
| 119 | 115 | android:layout_toEndOf="@+id/switch_visitors" /> |
| 120 | 116 | |
| 121 | 117 | <Button | ... | ... |