Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

app_modular/appworks/src/main/java/com/uas/appworks/widget/SelectPlayPop.java

@@ -42,7 +42,7 @@ public class SelectPlayPop {
         View view = LayoutInflater.from(ct).inflate(R.layout.pop_play_select, null);
         window.setContentView(view);
         window.getContentView().measure(0, 0);
-        int height = DisplayUtil.dip2px(ct, 280);
+        int height = DisplayUtil.sp2px(ct, 280);
         window.setHeight(height);
         window.setWidth(DisplayUtil.getSreechWidth(ct));
         initView(ct, window, view, model, onSureListener);

app_modular/appworks/src/main/res/layout/fragment_user.xml

@@ -159,6 +159,7 @@
     </RelativeLayout>
 
     <RelativeLayout
+        android:visibility="gone"
         android:id="@+id/messageRl"
         style="@style/IMTbleLine_UP_Me"
         android:clickable="true"

app_modular/appworks/src/main/res/layout/pop_play_select.xml

@@ -254,6 +254,9 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/agreeCb"
         android:layout_marginLeft="10dp"
+        android:lines="1"
+        android:ellipsize="end"
+        android:inputType="text"
         android:layout_toRightOf="@id/agreeCb"
         android:text="@string/charitable_user_agreement"
         android:textSize="@dimen/text_main"