Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

module_mine/src/main/res/layout/activity_personal_information.xml

@@ -60,7 +60,8 @@
                 android:gravity="right|center_vertical"
                 android:hint="请输入昵称"
                 android:maxLength="32"
-                android:maxLines="1"
+                android:singleLine="true"
+                android:ellipsize="end"
                 android:textColor="@color/colorMain"
                 android:textColorHint="@color/colorGray"
                 android:textSize="@dimen/text_16" />