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

# Conflicts:
#	RvClient/build.gradle

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 151
-        versionName "1.5.1"
+        versionCode 152
+        versionName "1.5.2"
         multiDexEnabled true
 
 

plugin_member/src/main/res/layout/activity_member.xml

@@ -68,6 +68,8 @@
                     android:id="@+id/tv_nickname"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLength="10"
                     android:textColor="@color/colorYellow"
                     android:textSize="@dimen/text_16"
                     android:visibility="gone" />