杨帅 / XiaojiaSoundBox · Commits

Commit 314e7e1316569ebfea19814d1c6c31c681ec1ebe

Authored by YangShuai
1 parent 6e9ad4e9

1 修复小家音箱BUG

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