Merge remote-tracking branch 'origin/4.1.64' into 4.1.64

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.59.40",
             "m-fm"            : "0.0.30.00",
-            "m-user"          : "0.0.60.46",
+            "m-user"          : "0.0.60.48",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.18.30",
             "m-dynamic"       : "0.0.7.13",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.51.16",
             "m-fm"            : "0.0.23.5",
-            "m-user"          : "0.0.60.46",
+            "m-user"          : "0.0.60.48",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.3.15",
             "m-dynamic"       : "0.0.1.7",

m-user/src/main/res/layout/user_activity_register_and_login_bottom.xml

@@ -83,6 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/platform_dp_4"
             android:textSize="12sp"
+            android:includeFontPadding="false"
             android:id="@+id/tv_protocol"
             android:textColor="@color/platform_color_999999"
             android:text="同意壹点灵用户注册协议" />