Commit d55b7419 by 刘鹏

feat: 合并release

parent 8856566b
...@@ -14,7 +14,7 @@ buildscript { ...@@ -14,7 +14,7 @@ buildscript {
ydlrouter_version = '1.2.3' ydlrouter_version = '1.2.3'
constrait_support_version = '1.0.2' constrait_support_version = '1.0.2'
componentVersion = "0.3.0.12" componentVersion = "0.3.0.12-lp"
} }
repositories { repositories {
mavenCentral() mavenCentral()
......
...@@ -421,8 +421,6 @@ ...@@ -421,8 +421,6 @@
<TextView <TextView
tools:text="11" tools:text="11"
android:id="@+id/iv_order_tip" android:id="@+id/iv_order_tip"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_alignEnd="@+id/iv_trade_order" android:layout_alignEnd="@+id/iv_trade_order"
android:layout_marginEnd="-2dp" android:layout_marginEnd="-2dp"
android:src="@drawable/user_mine_background_red_point_new_coupon" android:src="@drawable/user_mine_background_red_point_new_coupon"
...@@ -516,7 +514,7 @@ ...@@ -516,7 +514,7 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@id/ll_service" app:layout_constraintLeft_toRightOf="@id/ll_service"
app:layout_constraintRight_toLeftOf="@id/view_last_empty" app:layout_constraintRight_toLeftOf="@id/ll_wiki"
app:layout_constraintTop_toTopOf="@id/ll_my_courses"> app:layout_constraintTop_toTopOf="@id/ll_my_courses">
<ImageView <ImageView
...@@ -538,10 +536,13 @@ ...@@ -538,10 +536,13 @@
android:id="@+id/ll_wiki" android:id="@+id/ll_wiki"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" app:layout_constraintHorizontal_weight="1"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> app:layout_constraintRight_toRightOf="parent"
android:orientation="vertical"
app:layout_constraintLeft_toRightOf="@id/ll_meditation"
app:layout_constraintTop_toTopOf="@id/ll_my_courses">
<ImageView <ImageView
android:layout_width="25dp" android:layout_width="25dp"
......
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