Commit 0d8e4013 by 徐健

backup

parent 9f397a9e
......@@ -45,7 +45,7 @@ ext {
"m-confide" : "0.0.43",
"m-consultant" : "0.0.53",
"m-fm" : "0.0.25",
"m-user" : "0.0.44",
"m-user" : "0.0.44.2",
"m-home" : "0.0.16",
"m-im" : "0.0.9",
"m-dynamic" : "0.0.3",
......
......@@ -3,6 +3,7 @@ package com.yidianling.user.ui.login
import android.annotation.SuppressLint
import android.os.Build
import android.os.Handler
import android.text.Html
import android.view.KeyEvent
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.utils.ActivityManager
......@@ -87,7 +88,7 @@ class SecretActivity : BaseActivity() {
.subscribe({
if (it.code == 0) {
if (null != user_secret_desc) {
user_secret_desc.text = it.data
user_secret_desc.text = Html.fromHtml(it.data)
}
}
}, {
......
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="0.5dp"/>
<stroke android:width="0.5dp" android:color="#999999"/>
<corners android:radius="22dp" />
......
......@@ -5,16 +5,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:background="#ffffff">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/user_secret_top_bg" />
<RelativeLayout
android:id="@+id/user_top_rl"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="match_parent"
android:layout_height="103dp"
android:scaleType="fitXY"
android:src="@drawable/user_secret_top_bg" />
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/secrey_title"
......
......@@ -33,11 +33,11 @@
android:layout_height="wrap_content"
android:text="若您不同意隐私保护政策,您将无法正常使用相关附加功能或无法达到我们拟达到的功能效果。"
android:layout_marginLeft="25dp"
android:lineHeight="22dp"
android:layout_marginRight="25dp"
android:textSize="14dp"
android:lineSpacingExtra="3dp"
android:textColor="#999999"
android:layout_marginTop="8dp"
android:layout_marginTop="13dp"
android:layout_marginBottom="30dp"/>
<TextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment