Commit fd1fca83 authored by zhang_z's avatar zhang_z

提交代码;

parent 3585e8f1
...@@ -12,7 +12,7 @@ android { ...@@ -12,7 +12,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
ndk{ ndk{
abiFilters("armeabi", "armeabi-v7a") abiFilters("armeabi", "armeabi-v7a","x86")
} }
} }
//解决问题的代码 //解决问题的代码
......
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginEnd="@dimen/all_margin" android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:background="@mipmap/bg_marketing" android:background="@mipmap/bg_marketing"
...@@ -22,7 +26,7 @@ ...@@ -22,7 +26,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin_big" android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1" android:layout_weight="1"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" /> android:textSize="@dimen/all_sub_title_size" />
...@@ -32,7 +36,7 @@ ...@@ -32,7 +36,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin" android:layout_marginEnd="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin_big" android:layout_marginTop="@dimen/all_margin"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@mipmap/icon_buy01" /> android:src="@mipmap/icon_buy01" />
...@@ -64,6 +68,14 @@ ...@@ -64,6 +68,14 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="10dp"
/>
</LinearLayout>
</layout> </layout>
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