Commit 533f8c46 by 霍志良

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

parents b2cf2991 344b4525
...@@ -87,7 +87,8 @@ allprojects { ...@@ -87,7 +87,8 @@ allprojects {
// maven { url'http://developer.huawei.com/repo/' } // maven { url'http://developer.huawei.com/repo/' }
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { maven {
url 'https://maven.google.com' // url 'https://maven.google.com'
url'https://dl.google.com/dl/android/maven2/'
} }
maven { maven {
url 'https://dl.bintray.com/zouyuhan/maven' url 'https://dl.bintray.com/zouyuhan/maven'
......
...@@ -10,7 +10,7 @@ ext { ...@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.38", "m-user" : "0.0.60.38",
"m-home" : "0.0.22.33", "m-home" : "0.0.22.33",
"m-im" : "0.0.18.29", "m-im" : "0.0.18.30",
"m-dynamic" : "0.0.7.13", "m-dynamic" : "0.0.7.13",
"m-article" : "0.0.0.6", "m-article" : "0.0.0.6",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<gradient <gradient
android:startColor="#159cef" android:startColor="#159cef"
android:endColor="#22bfff" android:endColor="#22bfff"
android:angle="90" android:angle="180"
/> />
<corners android:radius="@dimen/platform_dp_18" /> <corners android:radius="@dimen/platform_dp_18" />
</shape> </shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="255dp" android:layout_width="245dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
> >
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
android:text="您可以点击以下按钮,将会有专业的咨询顾问为您推荐适合您的专家哦~" android:text="您可以点击以下按钮,将会有专业的咨询顾问为您推荐适合您的专家哦~"
android:textColor="@color/im_color_242424" android:textColor="@color/im_color_242424"
android:textSize="@dimen/im_text_size_17" android:textSize="@dimen/im_text_size_17"
android:lineSpacingExtra="@dimen/platform_dp_4"
android:layout_marginTop="@dimen/platform_dp_9" android:layout_marginTop="@dimen/platform_dp_9"
android:layout_marginLeft="@dimen/platform_dp_12" android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_marginRight="@dimen/platform_dp_12" /> android:layout_marginRight="@dimen/platform_dp_12" />
...@@ -31,6 +32,8 @@ ...@@ -31,6 +32,8 @@
android:paddingTop="@dimen/platform_dp_8" android:paddingTop="@dimen/platform_dp_8"
android:paddingRight="@dimen/platform_dp_30" android:paddingRight="@dimen/platform_dp_30"
android:paddingBottom="@dimen/platform_dp_8" android:paddingBottom="@dimen/platform_dp_8"
android:gravity="center"
android:includeFontPadding="false"
android:text="前往" android:text="前往"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/im_text_size_15" android:textSize="@dimen/im_text_size_15"
......
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