Skip to content

Y
YDL-Component-Medical
Commit d78fbf45 by 霍志良
Options

feat：首页UI修改

parent 5885e04e
Showing with 102 additions and 70 deletions
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
......@@ -5,6 +5,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.LinearLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy
......@@ -22,7 +23,7 @@ import kotlinx.android.synthetic.ydl.home_button_banner_view.view.*
*/
class HomeButtonBannerView(private val mContext: Context, private var homeEvent: IHomeBaseEvent?,var listenFree:Boolean) : LinearLayout(mContext) {
private var buttonParams: LinearLayout.LayoutParams? = null
private var buttonParams: ConstraintLayout.LayoutParams? = null
private var buttonParamsFrame: FrameLayout.LayoutParams? = null
private var buttonParamsFrame2: FrameLayout.LayoutParams? = null
......@@ -47,7 +48,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
.load(R.drawable.qingsu_new_free_dynamic)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.into(qingsuGif)
initButtonView()
// initButtonView()
homeModuleButtonBannerFirst.setOnClickListener {
homeEvent?.reservationExpertsClick()
......@@ -71,17 +72,16 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
val screenWidth = RxDeviceTool.getScreenWidth(mContext)
val viewWidth = ((screenWidth - 2 * 9 * RxDeviceTool.getScreenDensity(mContext)) / 4).toInt()
val viewHeight = viewWidth * 78 / 80
buttonParams = LinearLayout.LayoutParams(viewWidth, viewHeight)
buttonParams = ConstraintLayout.LayoutParams(viewWidth, viewHeight)
buttonParamsFrame = FrameLayout.LayoutParams(viewWidth, viewHeight)
buttonParamsFrame2= FrameLayout.LayoutParams((viewWidth/2.0).toInt(), (viewHeight/2.3).toInt())
buttonParamsFrame2!!.setMargins((((viewWidth/12f).toInt())),0,0,0)
qingsuGif.layoutParams=buttonParamsFrame2
// qingsuGif.layoutParams=buttonParamsFrame2
homeModuleButtonBannerFirst.layoutParams = buttonParams
homeModuleButtonBannerSecond.layoutParams = buttonParams
homeModuleButtonBannerThird.layoutParams = buttonParams
homeModuleButtonBannerFourth.layoutParams = buttonParams
homeModuleButtonBannerSecondFrame.layoutParams=buttonParamsFrame
// homeModuleButtonBannerSecondFrame.layoutParams=buttonParamsFrame
}
}
}
\ No newline at end of file
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeCategoryContainer.kt
......@@ -29,7 +29,7 @@ class HomeCategoryContainer(private val mContext: Context, private var homeEvent
private var lastPosition = 0
private var count = 0
private var mIndicatorWidth: Int = RxImageTool.dip2px(9f)
private var mIndicatorWidth: Int = RxImageTool.dip2px(15f)
private var mIndicatorHeight: Int = RxImageTool.dip2px(5f)
private var dp2 : Int = 0
......@@ -39,7 +39,7 @@ class HomeCategoryContainer(private val mContext: Context, private var homeEvent
init {
initView()
dp2 = RxImageTool.dip2px(4f)
dp2 = RxImageTool.dip2px(2f)
}
private fun initView() {
......@@ -52,13 +52,24 @@ class HomeCategoryContainer(private val mContext: Context, private var homeEvent
*/
fun initData(bean: HomeHeaderBean?) {
mHomeCategoryAdapter?.updateItems(bean?.askCategoryData)
if (bean?.askCategoryData?.size!! > PAGE_ITEM_SIZE){
count = Math.ceil(Math.ceil(bean.askCategoryData?.size?.toFloat()?.div(PAGE_ITEM_SIZE.toFloat())?.toDouble()!!)).toInt()
if (bean?.askCategoryData?.size!! >= PAGE_ITEM_SIZE) {
count = Math.ceil(
Math.ceil(
bean.askCategoryData?.size?.toFloat()?.div(PAGE_ITEM_SIZE.toFloat())
?.toDouble()!!
)
).toInt()
createIndicator()
val params = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,RxImageTool.dip2px(153f))
val params = RelativeLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
RxImageTool.dip2px(153f)
)
vp_category.layoutParams = params
}else{
val params = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,RxImageTool.dip2px(143f))
} else {
val params = RelativeLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
RxImageTool.dip2px(143f)
)
vp_category.layoutParams = params
ll_Indicator.visibility = View.GONE
}
......
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png

51.9 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png

3.08 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_first_img_new.png
  • 2-up
  • Swipe
  • Onion skin
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png

48.5 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png

3.56 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_fourth_img_new.png
  • 2-up
  • Swipe
  • Onion skin
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png

54.1 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png

3.47 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png
m-home/src/ydl/res/drawable-xhdpi/home_button_banner_third_img_new.png
  • 2-up
  • Swipe
  • Onion skin
m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png
m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png

22 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png

3.29 KB | W: 0px | H: 0px

m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png
m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png
m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png
m-home/src/ydl/res/drawable-xhdpi/home_confide_free_icon.png
  • 2-up
  • Swipe
  • Onion skin
m-home/src/ydl/res/drawable/home_category_tip_unselect.xml
......@@ -7,7 +7,7 @@
android:color="#E0E0E0"/>
<size
android:width="22dp"
android:width="5dp"
android:height="5dp"/>
......
m-home/src/ydl/res/layout/home_button_banner_view.xml
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/platform_dp_8"
android:paddingRight="@dimen/platform_dp_8"
android:layout_marginTop="@dimen/platform_dp_12"
>
android:layout_marginTop="@dimen/platform_dp_12">
<RelativeLayout
android:id="@+id/homeModuleButtonBannerFirst"
android:layout_width="80dp"
android:layout_height="78dp"
android:layout_width="82dp"
android:layout_height="82dp"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/homeModuleButtonBannerFourth"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/home_button_banner_first_img_new"
android:gravity="center">
<TextView
android:id="@+id/homeModuleButtonBannerFirstTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_16"
android:text="心理咨询"/>
android:text="心理咨询" />
<TextView
android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_12"
android:text="3W+师资"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/homeModuleButtonBannerFourth"
android:layout_width="80dp"
android:layout_height="78dp"
android:layout_width="82dp"
android:layout_height="82dp"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toRightOf="@id/homeModuleButtonBannerFirst"
app:layout_constraintRight_toLeftOf="@id/homeModuleButtonBannerThird"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/home_confide_free_icon"
android:gravity="center">
<TextView
android:id="@+id/homeModuleButtonBannerFourthTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_16"
android:text="心理测试"/>
android:text="心理测试" />
<TextView
android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12"
android:text="抑郁测量"/>
android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
android:text="抑郁测量"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/homeModuleButtonBannerThird"
android:layout_width="80dp"
android:layout_height="78dp"
android:layout_width="82dp"
android:layout_height="82dp"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toRightOf="@id/homeModuleButtonBannerFourth"
app:layout_constraintRight_toLeftOf="@id/homeModuleButtonBannerSecond"
app:layout_constraintTop_toTopOf="parent"
android:orientation="vertical"
android:background="@drawable/home_button_banner_third_img_new"
android:gravity="center">
<TextView
android:id="@+id/homeModuleButtonBannerThirdTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_16"
android:text="心理课堂"/>
<TextView
android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_12"
android:text="学习与成长"/>
</RelativeLayout>
<FrameLayout
android:id="@+id/homeModuleButtonBannerSecond"
android:layout_width="80dp"
android:layout_height="78dp"
android:background="@drawable/home_button_banner_fourth_img_new"
>
<RelativeLayout
android:id="@+id/homeModuleButtonBannerSecondFrame"
android:layout_width="80dp"
android:layout_height="78dp"
android:gravity="center">
<TextView
android:id="@+id/homeModuleButtonBannerSecondTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_16"
android:text="倾诉热线"/>
<TextView
<FrameLayout
android:id="@+id/homeModuleButtonBannerSecond"
android:layout_width="82dp"
android:layout_height="82dp"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toRightOf="@id/homeModuleButtonBannerThird"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/home_button_banner_fourth_img_new">
<RelativeLayout
android:id="@+id/homeModuleButtonBannerSecondFrame"
android:layout_width="82dp"
android:layout_height="82dp"
android:gravity="center">
<TextView
android:id="@+id/homeModuleButtonBannerSecondTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_16"
android:text="倾诉热线" />
<TextView
android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12"
android:text="温暖守护您"/>
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/qingsuGif"
android:visibility="gone"
>
</ImageView>
</FrameLayout>
</LinearLayout>
android:textColor="@color/black"
android:textSize="@dimen/platform_dp_12"
android:text="温暖守护您" />
</RelativeLayout>
<ImageView
android:layout_width="@dimen/platform_dp_48"
android:layout_height="@dimen/platform_dp_22"
android:id="@+id/qingsuGif"
android:visibility="visible"></ImageView>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
m-home/src/ydl/res/layout/home_category_container.xml
......@@ -23,7 +23,7 @@
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:visibility="gone"
android:visibility="visible"
tools:visibility="visible"/>
</RelativeLayout>
\ No newline at end of file
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