Skip to content

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

Merge branch 'feat/diamond_category_zl' into 'd/v4.4.07' 

Feat/diamond category zl

See merge request app_android_lib/YDL-Component!305
parents 9c6c7dc8 294761cf
Showing with 49 additions and 42 deletions
build.gradle
...@@ -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.19" componentVersion = "0.3.0.30-SNAPSHOP"
} }
repositories { repositories {
mavenCentral() mavenCentral()
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/AreaPopupWindow.kt
...@@ -48,8 +48,6 @@ class AreaPopupWindow( ...@@ -48,8 +48,6 @@ class AreaPopupWindow(
var onRegionSelectedListener: OnRegionSelectedListener? = null var onRegionSelectedListener: OnRegionSelectedListener? = null
private var subLocationItem: SubItem? = SubItem() private var subLocationItem: SubItem? = SubItem()
private val locationCode = "-1" private val locationCode = "-1"
private val recentCityCode = "0"
private var locationRegionItem: RegionItem? = null
private var locationList: ArrayList<SubItem>? = arrayListOf() private var locationList: ArrayList<SubItem>? = arrayListOf()
private var locationHistoryList = regionList private var locationHistoryList = regionList
...@@ -69,11 +67,12 @@ class AreaPopupWindow( ...@@ -69,11 +67,12 @@ class AreaPopupWindow(
} else { } else {
subList.addAll(regionList[0].sub) subList.addAll(regionList[0].sub)
} }
recentCityBean = recentCityBean =
MMKV.defaultMMKV().decodeParcelable( MMKV.defaultMMKV().decodeParcelable(
RECENT_CITY, RECENT_CITY,
ConsultantRecentCity::class.java ConsultantRecentCity::class.java
) )
if (recentCityBean == null) recentCityBean = ConsultantRecentCity(arrayListOf())
subAdapter = SubRecyclerViewAdapter(context, subList, selectedSub, locationCode) subAdapter = SubRecyclerViewAdapter(context, subList, selectedSub, locationCode)
subAdapter.setOnAuthClickLister(object : SubRecyclerViewAdapter.OnAuthClickLister { subAdapter.setOnAuthClickLister(object : SubRecyclerViewAdapter.OnAuthClickLister {
override fun onAuthClick() { override fun onAuthClick() {
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/PricePopupWindow.kt
...@@ -111,13 +111,15 @@ class PricePopupWindow( ...@@ -111,13 +111,15 @@ class PricePopupWindow(
) { ) {
if (track) { if (track) {
max_Price = ((rightValue / 100) * maxPriceValue).toInt().toString() max_Price = ((rightValue / 100) * maxPriceValue).toInt().toString()
min_Price = ((leftValue / 100) * maxPriceValue).toInt().toString()
tempFilter.priceRanges = PriceRangesItem(min_Price, max_Price)
if (rightValue > 93) { if (rightValue > 93) {
max_Price = infiniteText max_Price = infiniteText
} }
min_Price = ((leftValue / 100) * maxPriceValue).toInt().toString()
ActionCountUtils.count(PRICE_SLIDE_CLICK, "$min_Price-$max_Price") ActionCountUtils.count(PRICE_SLIDE_CLICK, "$min_Price-$max_Price")
contentView.tv_start_end_price.text = contentView.tv_start_end_price.text =
"$min_Price-$max_Price" "$min_Price-$max_Price"
} }
} }
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/rangeseekbar/RangeSeekBar.java
...@@ -375,7 +375,11 @@ public class RangeSeekBar extends View { ...@@ -375,7 +375,11 @@ public class RangeSeekBar extends View {
if (tickMarkLayoutGravity == Gravity.TOP) { if (tickMarkLayoutGravity == Gravity.TOP) {
y = getProgressTop() - tickMarkTextMargin; y = getProgressTop() - tickMarkTextMargin;
} else { } else {
y = getProgressBottom() + tickMarkTextMargin + tickMarkTextRect.height() - 10; if (i == tickMarkTextArray.length - 1) {
y = getProgressBottom() + tickMarkTextMargin + tickMarkTextRect.height() - 14;
} else {
y = getProgressBottom() + tickMarkTextMargin + tickMarkTextRect.height() - 10;
}
} }
canvas.drawText(text2Draw, x, y, paint); canvas.drawText(text2Draw, x, y, paint);
} }
...@@ -445,7 +449,7 @@ public class RangeSeekBar extends View { ...@@ -445,7 +449,7 @@ public class RangeSeekBar extends View {
//如果是奇数Setp，则不绘制刻度 //如果是奇数Setp，则不绘制刻度
// if (k % 2 == 1) continue; // if (k % 2 == 1) continue;
float x = getProgressLeft() + k * stepMarks - stepsWidth / 2f; float x = getProgressLeft() + k * stepMarks - stepsWidth / 2f;
stepDivRect.set(x, getProgressTop() + stepsHeight, x + stepsWidth, getProgressBottom() + 3 * stepsHeight); stepDivRect.set(x, getProgressTop() + stepsHeight + 8, x + stepsWidth, getProgressBottom() + 3 * stepsHeight + 10);
if (stepsBitmaps.isEmpty() || stepsBitmaps.size() <= k) { if (stepsBitmaps.isEmpty() || stepsBitmaps.size() <= k) {
paint.setColor(stepsColor); paint.setColor(stepsColor);
canvas.drawRoundRect(stepDivRect, stepsRadius, stepsRadius, paint); canvas.drawRoundRect(stepDivRect, stepsRadius, stepsRadius, paint);
......
m-consultant/src/main/res/drawable/thumb_yellow_stroke.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:shape="oval"> android:shape="oval">
<solid android:color="@android:color/white" /> <solid android:color="@android:color/white" />
<stroke <stroke
android:width="2dp" android:width="3.5dp"
android:color="@color/platform_main_theme" /> android:color="@color/platform_main_theme" />
</shape> </shape>
m-consultant/src/main/res/layout/consultant_item_consult_type.xml
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="授权" android:text="授权"
android:includeFontPadding="false"
android:textColor="@color/platform_main_theme" android:textColor="@color/platform_main_theme"
android:textSize="@dimen/platform_sp_14" android:textSize="@dimen/platform_sp_14"
android:visibility="gone" /> android:visibility="gone" />
......
m-consultant/src/main/res/layout/consultant_layout_search_content.xml
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="6dp" android:layout_height="2dp"
android:background="@drawable/consult_fillter_bg" /> android:background="@drawable/consult_fillter_bg" />
</LinearLayout> </LinearLayout>
......
m-consultant/src/main/res/layout/consultant_ui_price_popup_window.xml
...@@ -33,9 +33,10 @@ ...@@ -33,9 +33,10 @@
android:id="@+id/range_price_seekbar" android:id="@+id/range_price_seekbar"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/platform_dp_12" android:layout_marginStart="@dimen/platform_dp_20"
android:layout_marginEnd="@dimen/platform_dp_12" android:layout_marginEnd="@dimen/platform_dp_20"
android:layout_marginTop="@dimen/platform_dp_15" android:layout_marginTop="@dimen/platform_dp_15"
app:rsb_progress_height="3.5dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_start_end_price" app:layout_constraintTop_toBottomOf="@id/tv_start_end_price"
...@@ -43,13 +44,13 @@ ...@@ -43,13 +44,13 @@
app:rsb_mode="range" app:rsb_mode="range"
app:rsb_progress_color="@color/platform_main_theme" app:rsb_progress_color="@color/platform_main_theme"
app:rsb_step_auto_bonding="true" app:rsb_step_auto_bonding="true"
app:rsb_step_color="@color/platform_gray7" app:rsb_step_color="#c3c4ca"
app:rsb_step_height="5dp" app:rsb_step_height="3.5dp"
app:rsb_step_width="0.5dp" app:rsb_step_width="0.5dp"
app:rsb_steps="6" app:rsb_steps="6"
app:rsb_thumb_drawable="@drawable/thumb_yellow_stroke" app:rsb_thumb_drawable="@drawable/thumb_yellow_stroke"
app:rsb_thumb_height="15dp" app:rsb_thumb_height="@dimen/platform_dp_15"
app:rsb_thumb_width="15dp" app:rsb_thumb_width="@dimen/platform_dp_15"
app:rsb_tick_mark_layout_gravity="bottom" app:rsb_tick_mark_layout_gravity="bottom"
app:rsb_tick_mark_mode="other" app:rsb_tick_mark_mode="other"
app:rsb_tick_mark_text_array="@array/wordsArray" app:rsb_tick_mark_text_array="@array/wordsArray"
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
android:layout_marginTop="@dimen/platform_dp_30" android:layout_marginTop="@dimen/platform_dp_30"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/range_price_seekbar"></View> app:layout_constraintTop_toBottomOf="@id/range_price_seekbar" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
m-home/src/main/res/layout/home_category_list_item.xml
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<ImageView <ImageView
android:id="@+id/category_img" android:id="@+id/category_img"
android:layout_width="@dimen/platform_dp_30" android:layout_width="@dimen/platform_dp_27"
android:layout_height="@dimen/platform_dp_30" /> android:layout_height="@dimen/platform_dp_27" />
<TextView <TextView
android:id="@+id/category_text" android:id="@+id/category_text"
......
m-home/src/ydl/res/layout/home_button_banner_view.xml
...@@ -18,15 +18,15 @@ ...@@ -18,15 +18,15 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/home_button_banner_first_img_new" android:background="@drawable/home_button_banner_first_img_new"
android:gravity="center" android:gravity="center"
android:paddingRight="@dimen/platform_dp_10"> android:paddingRight="@dimen/platform_dp_8">
<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:text="心理咨询" android:text="心理咨询"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_16" android:textSize="15sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/homeModuleButtonBannerFirstTitle" android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
android:text="3W+师资" android:text="3W+师资"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_12" /> android:textSize="@dimen/platform_sp_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
...@@ -45,15 +45,15 @@ ...@@ -45,15 +45,15 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/home_confide_free_icon" android:background="@drawable/home_confide_free_icon"
android:gravity="center" android:gravity="center"
android:paddingRight="@dimen/platform_dp_10"> android:paddingRight="@dimen/platform_dp_8">
<TextView <TextView
android:id="@+id/homeModuleButtonBannerFourthTitle" 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:text="心理测试" android:text="心理测试"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_16" android:textSize="15sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/homeModuleButtonBannerFourthTitle" android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
android:text="抑郁测量" android:text="抑郁测量"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_12" /> android:textSize="@dimen/platform_sp_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
...@@ -73,15 +73,15 @@ ...@@ -73,15 +73,15 @@
android:background="@drawable/home_button_banner_third_img_new" android:background="@drawable/home_button_banner_third_img_new"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingRight="@dimen/platform_dp_10"> android:paddingRight="@dimen/platform_dp_8">
<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:text="心理课堂" android:text="心理课堂"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_16" android:textSize="15sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/homeModuleButtonBannerThirdTitle" android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
android:text="学习与成长" android:text="学习与成长"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_12" /> android:textSize="@dimen/platform_sp_12" />
</RelativeLayout> </RelativeLayout>
<FrameLayout <FrameLayout
...@@ -105,15 +105,15 @@ ...@@ -105,15 +105,15 @@
android:layout_width="78dp" android:layout_width="78dp"
android:layout_height="78dp" android:layout_height="78dp"
android:gravity="center" android:gravity="center"
android:paddingRight="@dimen/platform_dp_10"> android:paddingRight="@dimen/platform_dp_8">
<TextView <TextView
android:id="@+id/homeModuleButtonBannerSecondTitle" 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:text="倾诉热线" android:text="倾诉热线"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_16" android:textSize="15sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/homeModuleButtonBannerSecondTitle" android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
android:text="温暖守护您" android:text="温暖守护您"
android:textColor="@color/black" android:textColor="@color/color_1C1F28"
android:textSize="@dimen/platform_dp_12" /> android:textSize="@dimen/platform_sp_12" />
</RelativeLayout> </RelativeLayout>
<ImageView <ImageView
......
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