Skip to content

Y
YDL-Component-Medical
Commit 03eb111e by konghaorui
Options

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

parents 6633b7e9 132e1bf4
Showing with 277 additions and 286 deletions
config.gradle
...@@ -46,7 +46,7 @@ ext { ...@@ -46,7 +46,7 @@ ext {
"m-consultant" : "0.0.52", "m-consultant" : "0.0.52",
"m-fm" : "0.0.24", "m-fm" : "0.0.24",
"m-user" : "0.0.42", "m-user" : "0.0.42",
"m-home" : "0.0.8.2", "m-home" : "0.0.8.3",
"m-im" : "0.0.4.4", "m-im" : "0.0.4.4",
"m-dynamic" : "0.0.2.1", "m-dynamic" : "0.0.2.1",
......
m-home/src/xlzx/res/layout/home_button_banner_view.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/ll_home_module_button"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:id="@+id/ll_home_module_button" android:layout_height="wrap_content"
android:layout_width="match_parent" android:orientation="vertical">
android:layout_height="wrap_content"
android:orientation="vertical" <com.yidianling.home.ui.widget.HomeModuleCategoryView
> android:id="@+id/home_category_view"
<com.yidianling.home.ui.widget.HomeModuleCategoryView android:layout_width="match_parent"
android:id="@+id/home_category_view" android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="wrap_content" <LinearLayout
/> android:layout_width="match_parent"
android:layout_height="wrap_content"
<LinearLayout android:layout_marginLeft="15dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_width="match_parent" android:layout_marginRight="15dp"
android:layout_height="wrap_content" android:gravity="center_horizontal"
android:layout_marginLeft="15dp" android:orientation="horizontal"
android:layout_marginRight="15dp" android:paddingBottom="20dp">
android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingBottom="20dp" <RelativeLayout
> android:id="@+id/homeModuleButtonBannerFirst"
android:layout_width="0dp"
android:layout_height="78dp"
<RelativeLayout android:layout_marginEnd="8dp"
android:id="@+id/homeModuleButtonBannerFirst" android:layout_marginRight="8dp"
android:layout_width="0dp" android:layout_weight="1"
android:layout_height="78dp" android:background="@drawable/home_dcotor_bt_bg"
android:layout_marginEnd="8dp" android:gravity="center">
android:layout_marginRight="8dp"
android:layout_weight="1" <TextView
android:background="@drawable/home_dcotor_bt_bg" android:id="@+id/homeModuleButtonBannerFirstTitle"
android:gravity="center" android:layout_width="wrap_content"
> android:layout_height="wrap_content"
android:text="预约咨询"
<TextView android:textColor="@color/platform_black"
android:id="@+id/homeModuleButtonBannerFirstTitle" android:textSize="@dimen/platform_dp_16"
android:layout_width="wrap_content" android:textStyle="bold" />
android:layout_height="wrap_content"
android:text="预约咨询" <TextView
android:textColor="@color/platform_black" android:layout_width="wrap_content"
android:textSize="@dimen/platform_dp_16" android:layout_height="wrap_content"
android:textStyle="bold"/> android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
android:layout_marginTop="2dp"
<TextView android:text="1W+师资"
android:layout_marginTop="2dp" android:textColor="@color/platform_color_444444"
android:layout_width="wrap_content" android:textSize="@dimen/platform_dp_11" />
android:layout_height="wrap_content" </RelativeLayout>
android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
android:text="1W+师资" <RelativeLayout
android:textColor="@color/platform_color_444444" android:id="@+id/homeModuleButtonBannerFourth"
android:textSize="@dimen/platform_dp_11"/> android:layout_width="0dp"
</RelativeLayout> android:layout_height="78dp"
android:layout_weight="1"
<RelativeLayout android:background="@drawable/home_listen_bt_bg"
android:id="@+id/homeModuleButtonBannerSecond" android:gravity="center">
android:layout_width="0dp"
android:layout_height="78dp" <TextView
android:layout_marginEnd="8dp" android:id="@+id/homeModuleButtonBannerFourthTitle"
android:layout_marginRight="8dp" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="wrap_content"
android:background="@drawable/home_listen_bt_bg" android:text="心理测试"
> android:textColor="@color/platform_black"
android:textSize="@dimen/platform_dp_16"
<RelativeLayout android:textStyle="bold" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" <TextView
android:layout_alignParentLeft="true" android:layout_width="wrap_content"
android:paddingTop="1dp" android:layout_height="wrap_content"
android:paddingBottom="1dp" android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
android:paddingLeft="5dp" android:layout_marginTop="2dp"
android:paddingRight="5dp" android:text="专业权威"
android:background="@drawable/home_button_first_free_bg"> android:textColor="@color/platform_color_444444"
</RelativeLayout> android:textSize="@dimen/platform_dp_11" />
</RelativeLayout>
<LinearLayout
android:gravity="center_vertical" <RelativeLayout
android:layout_centerVertical="true" android:id="@+id/homeModuleButtonBannerThird"
android:orientation="vertical" android:layout_width="0dp"
android:layout_gravity="center_horizontal" android:layout_height="78dp"
android:layout_width="match_parent" android:layout_marginEnd="8dp"
android:layout_height="match_parent" android:layout_marginRight="8dp"
> android:layout_weight="1"
android:background="@drawable/home_course_bt_bg"
<LinearLayout android:gravity="center"
android:layout_gravity="center" android:orientation="vertical">
android:orientation="vertical"
android:layout_width="wrap_content" <TextView
android:layout_height="wrap_content" android:id="@+id/homeModuleButtonBannerThirdTitle"
> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<TextView android:text="心理课堂"
android:layout_gravity="center" android:textColor="@color/platform_black"
android:id="@+id/homeModuleButtonBannerSecondTitle" android:textSize="@dimen/platform_dp_16"
android:layout_width="wrap_content" android:textStyle="bold" />
android:layout_height="wrap_content"
android:text="即时倾诉" <TextView
android:textColor="@color/platform_black" android:layout_width="wrap_content"
android:textSize="@dimen/platform_dp_16" android:layout_height="wrap_content"
android:textStyle="bold"/> android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
android:layout_marginTop="2dp"
<TextView android:text="送28元礼包"
android:layout_marginTop="2dp" android:textColor="@color/platform_color_444444"
android:layout_width="wrap_content" android:textSize="@dimen/platform_dp_11" />
android:layout_height="wrap_content" </RelativeLayout>
android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
android:text="专业解忧" <RelativeLayout
android:textColor="@color/platform_color_444444" android:id="@+id/homeModuleButtonBannerSecond"
android:layout_centerVertical="true" android:layout_width="0dp"
android:textSize="@dimen/platform_dp_11"/> android:layout_height="78dp"
android:layout_marginEnd="8dp"
</LinearLayout> android:layout_marginRight="8dp"
android:layout_weight="1"
</LinearLayout> android:background="@drawable/home_test_bt_bg">
<RelativeLayout
</RelativeLayout> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<RelativeLayout android:layout_alignParentLeft="true"
android:id="@+id/homeModuleButtonBannerThird" android:background="@drawable/home_button_first_free_bg"
android:layout_width="0dp" android:paddingLeft="5dp"
android:layout_height="78dp" android:paddingTop="1dp"
android:layout_marginEnd="8dp" android:paddingRight="5dp"
android:layout_marginRight="8dp" android:paddingBottom="1dp"/>
android:layout_weight="1"
android:background="@drawable/home_course_bt_bg" <LinearLayout
android:gravity="center" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="match_parent"
android:layout_centerVertical="true"
<TextView android:layout_gravity="center_horizontal"
android:id="@+id/homeModuleButtonBannerThirdTitle" android:gravity="center_vertical"
android:layout_width="wrap_content" android:orientation="vertical">
android:layout_height="wrap_content"
android:text="心理课堂" <LinearLayout
android:textColor="@color/platform_black" android:layout_width="wrap_content"
android:textSize="@dimen/platform_dp_16" android:layout_height="wrap_content"
android:textStyle="bold"/> android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_marginTop="2dp" <TextView
android:layout_width="wrap_content" android:id="@+id/homeModuleButtonBannerSecondTitle"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_below="@+id/homeModuleButtonBannerThirdTitle" android:layout_height="wrap_content"
android:text="送28元礼包" android:layout_gravity="center"
android:textColor="@color/platform_color_444444" android:text="即时倾诉"
android:textSize="@dimen/platform_dp_11"/> android:textColor="@color/platform_black"
</RelativeLayout> android:textSize="@dimen/platform_dp_16"
android:textStyle="bold" />
<RelativeLayout
android:id="@+id/homeModuleButtonBannerFourth" <TextView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="78dp" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
android:background="@drawable/home_test_bt_bg" android:layout_centerVertical="true"
android:gravity="center" android:layout_marginTop="2dp"
> android:text="专业解忧"
android:textColor="@color/platform_color_444444"
<TextView android:textSize="@dimen/platform_dp_11" />
android:id="@+id/homeModuleButtonBannerFourthTitle"
android:layout_width="wrap_content" </LinearLayout>
android:layout_height="wrap_content"
android:text="心理测试" </LinearLayout>
android:textColor="@color/platform_black"
android:textSize="@dimen/platform_dp_16"
android:textStyle="bold"/> </RelativeLayout>
<TextView
android:layout_marginTop="2dp" </LinearLayout>
android:layout_width="wrap_content" </LinearLayout>
android:layout_height="wrap_content"
android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
android:text="专业权威"
android:textColor="@color/platform_color_444444"
android:textSize="@dimen/platform_dp_11"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
m-home/src/ydl/res/layout/home_button_banner_view.xml
<?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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingLeft="@dimen/platform_dp_8" android:paddingLeft="@dimen/platform_dp_8"
android:paddingRight="@dimen/platform_dp_8"> android:paddingRight="@dimen/platform_dp_8">
<RelativeLayout <RelativeLayout
android:id="@+id/homeModuleButtonBannerFirst" android:id="@+id/homeModuleButtonBannerFirst"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="78dp" android:layout_height="78dp"
android:background="@drawable/home_button_banner_first_img_new" android:background="@drawable/home_button_banner_first_img_new"
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:id="@+id/homeModuleButtonBannerFirstTitle" android:id="@+id/homeModuleButtonBannerFirstTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_16" android:textSize="@dimen/platform_dp_16"
android:text="心理咨询"/> android:text="心理咨询"/>
<TextView <TextView
android:layout_below="@+id/homeModuleButtonBannerFirstTitle" android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12" android:textSize="@dimen/platform_dp_12"
android:text="1W+师资"/> android:text="1W+师资"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/homeModuleButtonBannerSecond" android:id="@+id/homeModuleButtonBannerFourth"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="78dp" android:layout_height="78dp"
android:background="@drawable/home_confide_free_icon" android:background="@drawable/home_confide_free_icon"
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:id="@+id/homeModuleButtonBannerSecondTitle" android:id="@+id/homeModuleButtonBannerFourthTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_16" android:textSize="@dimen/platform_dp_16"
android:text="即时倾诉"/> android:text="心理测试"/>
<TextView <TextView
android:layout_below="@+id/homeModuleButtonBannerSecondTitle" android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12" android:textSize="@dimen/platform_dp_12"
android:text="24小时在线"/> android:text="抑郁测量"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/homeModuleButtonBannerThird" android:id="@+id/homeModuleButtonBannerThird"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="78dp" android:layout_height="78dp"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/home_button_banner_third_img_new" android:background="@drawable/home_button_banner_third_img_new"
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:id="@+id/homeModuleButtonBannerThirdTitle" android:id="@+id/homeModuleButtonBannerThirdTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_16" android:textSize="@dimen/platform_dp_16"
android:text="心理课堂"/> android:text="心理课堂"/>
<TextView <TextView
android:layout_below="@+id/homeModuleButtonBannerThirdTitle" android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12" android:textSize="@dimen/platform_dp_12"
android:text="送28元礼包"/> android:text="送28元礼包"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/homeModuleButtonBannerFourth" android:id="@+id/homeModuleButtonBannerSecond"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="78dp" android:layout_height="78dp"
android:background="@drawable/home_button_banner_fourth_img_new" android:background="@drawable/home_button_banner_fourth_img_new"
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:id="@+id/homeModuleButtonBannerFourthTitle" android:id="@+id/homeModuleButtonBannerSecondTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_16" android:textSize="@dimen/platform_dp_16"
android:text="心理测试"/> android:text="即时倾诉"/>
<TextView <TextView
android:layout_below="@+id/homeModuleButtonBannerFourthTitle" android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF" android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12" android:textSize="@dimen/platform_dp_12"
android:text="抑郁测量"/> android:text="24小时在线"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout>
</LinearLayout>
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