Commit 314e7e1316569ebfea19814d1c6c31c681ec1ebe
1 parent
6e9ad4e9
1 修复小家音箱BUG
Showing
7 changed files
with
15 additions
and
11 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
| @@ -264,7 +264,7 @@ public class UserManagerView implements MvpView { | @@ -264,7 +264,7 @@ public class UserManagerView implements MvpView { | ||
| 264 | } | 264 | } |
| 265 | }); | 265 | }); |
| 266 | } else { | 266 | } else { |
| 267 | - AlertUtil.showDeftToast(getContext(), "设置失败,请稍后重试"); | 267 | + AlertUtil.showDeftToast(getContext(), "保存失败，请移除成员再试"); |
| 268 | dialog.dismiss(); | 268 | dialog.dismiss(); |
| 269 | } | 269 | } |
| 270 | } | 270 | } |
module_xiaojiaSoundBox/src/main/res/layout/activity_remote_control.xml
| @@ -25,10 +25,11 @@ | @@ -25,10 +25,11 @@ | ||
| 25 | android:orientation="vertical"> <!--远程控制--> | 25 | android:orientation="vertical"> <!--远程控制--> |
| 26 | <LinearLayout | 26 | <LinearLayout |
| 27 | android:layout_width="match_parent" | 27 | android:layout_width="match_parent" |
| 28 | - android:layout_height="90dp" | 28 | + android:layout_height="wrap_content" |
| 29 | android:layout_margin="10dp" | 29 | android:layout_margin="10dp" |
| 30 | android:background="@drawable/shape_xiaojia_10_radius_white_bg" | 30 | android:background="@drawable/shape_xiaojia_10_radius_white_bg" |
| 31 | android:clickable="true" | 31 | android:clickable="true" |
| 32 | + android:minHeight="90dp" | ||
| 32 | android:orientation="vertical"> | 33 | android:orientation="vertical"> |
| 33 | 34 | ||
| 34 | <LinearLayout | 35 | <LinearLayout |
module_xiaojiaSoundBox/src/main/res/layout/dialog_edit_role.xml
| @@ -41,13 +41,15 @@ | @@ -41,13 +41,15 @@ | ||
| 41 | <ImageView | 41 | <ImageView |
| 42 | android:id="@+id/iv_icon" | 42 | android:id="@+id/iv_icon" |
| 43 | android:layout_width="40dp" | 43 | android:layout_width="40dp" |
| 44 | - android:layout_height="40dp" /> | 44 | + android:layout_height="40dp" |
| 45 | + android:layout_marginLeft="10dp" /> | ||
| 45 | 46 | ||
| 46 | <TextView | 47 | <TextView |
| 47 | android:id="@+id/tv_user_name" | 48 | android:id="@+id/tv_user_name" |
| 48 | android:layout_width="wrap_content" | 49 | android:layout_width="wrap_content" |
| 49 | android:layout_height="wrap_content" | 50 | android:layout_height="wrap_content" |
| 50 | android:layout_marginLeft="10dp" | 51 | android:layout_marginLeft="10dp" |
| 52 | + android:layout_marginRight="10dp" | ||
| 51 | android:text="用户昵称" | 53 | android:text="用户昵称" |
| 52 | android:textColor="@color/color_282828" | 54 | android:textColor="@color/color_282828" |
| 53 | android:textSize="17sp" /> | 55 | android:textSize="17sp" /> |
module_xiaojiaSoundBox/src/main/res/layout/fragment_device_manager.xml
| @@ -71,11 +71,12 @@ | @@ -71,11 +71,12 @@ | ||
| 71 | <LinearLayout | 71 | <LinearLayout |
| 72 | android:id="@+id/ll_device_name" | 72 | android:id="@+id/ll_device_name" |
| 73 | android:layout_width="match_parent" | 73 | android:layout_width="match_parent" |
| 74 | - android:layout_height="50dp" | 74 | + android:layout_height="wrap_content" |
| 75 | android:layout_marginTop="10dp" | 75 | android:layout_marginTop="10dp" |
| 76 | android:layout_marginBottom="10dp" | 76 | android:layout_marginBottom="10dp" |
| 77 | android:background="@drawable/selectable_xiaojia_item_white" | 77 | android:background="@drawable/selectable_xiaojia_item_white" |
| 78 | - android:clickable="true"> | 78 | + android:clickable="true" |
| 79 | + android:minHeight="50dp"> | ||
| 79 | 80 | ||
| 80 | <LinearLayout | 81 | <LinearLayout |
| 81 | android:layout_width="wrap_content" | 82 | android:layout_width="wrap_content" |
| @@ -106,12 +107,10 @@ | @@ -106,12 +107,10 @@ | ||
| 106 | android:layout_width="wrap_content" | 107 | android:layout_width="wrap_content" |
| 107 | android:layout_height="wrap_content" | 108 | android:layout_height="wrap_content" |
| 108 | android:layout_centerVertical="true" | 109 | android:layout_centerVertical="true" |
| 109 | - android:layout_marginLeft="10dp" | 110 | + android:layout_marginLeft="15dp" |
| 110 | android:layout_marginRight="10dp" | 111 | android:layout_marginRight="10dp" |
| 111 | android:layout_toEndOf="@id/iv_right" | 112 | android:layout_toEndOf="@id/iv_right" |
| 112 | android:layout_toRightOf="@id/tv_menu_title" | 113 | android:layout_toRightOf="@id/tv_menu_title" |
| 113 | - android:gravity="center|right" | ||
| 114 | - android:maxLines="1" | ||
| 115 | android:textColor="@color/color_C3C3C3" | 114 | android:textColor="@color/color_C3C3C3" |
| 116 | android:textSize="14sp" /> | 115 | android:textSize="14sp" /> |
| 117 | 116 |
module_xiaojiaSoundBox/src/main/res/layout/item_list_user_host.xml
| @@ -32,8 +32,9 @@ | @@ -32,8 +32,9 @@ | ||
| 32 | android:layout_width="wrap_content" | 32 | android:layout_width="wrap_content" |
| 33 | android:layout_height="wrap_content" | 33 | android:layout_height="wrap_content" |
| 34 | android:ellipsize="end" | 34 | android:ellipsize="end" |
| 35 | - android:maxLength="6" | 35 | + android:maxEms="8" |
| 36 | android:text="用户名称" | 36 | android:text="用户名称" |
| 37 | + android:singleLine="true" | ||
| 37 | android:textColor="@color/color_282828" | 38 | android:textColor="@color/color_282828" |
| 38 | android:textSize="16sp" | 39 | android:textSize="16sp" |
| 39 | android:textStyle="bold" /> | 40 | android:textStyle="bold" /> |
module_xiaojiaSoundBox/src/main/res/layout/item_list_user_member.xml
| @@ -36,8 +36,9 @@ | @@ -36,8 +36,9 @@ | ||
| 36 | android:layout_width="wrap_content" | 36 | android:layout_width="wrap_content" |
| 37 | android:layout_height="wrap_content" | 37 | android:layout_height="wrap_content" |
| 38 | android:ellipsize="end" | 38 | android:ellipsize="end" |
| 39 | - android:maxLength="6" | 39 | + android:maxEms="8" |
| 40 | android:text="用户名称" | 40 | android:text="用户名称" |
| 41 | + android:singleLine="true" | ||
| 41 | android:textColor="@color/color_282828" | 42 | android:textColor="@color/color_282828" |
| 42 | android:textSize="16sp" | 43 | android:textSize="16sp" |
| 43 | android:textStyle="bold" /> | 44 | android:textStyle="bold" /> |