Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
5743717e
Commit
5743717e
authored
Aug 11, 2022
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:修改UI
parent
54bfd6e2
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
40 additions
and
34 deletions
+40
-34
build.gradle
build.gradle
+1
-1
RangeSeekBar.java
m-consultant/src/main/java/com/yidianling/consultant/ui/view/rangeseekbar/RangeSeekBar.java
+6
-2
thumb_yellow_stroke.xml
m-consultant/src/main/res/drawable/thumb_yellow_stroke.xml
+1
-1
consultant_item_consult_type.xml
m-consultant/src/main/res/layout/consultant_item_consult_type.xml
+1
-0
consultant_layout_search_content.xml
m-consultant/src/main/res/layout/consultant_layout_search_content.xml
+1
-1
consultant_ui_price_popup_window.xml
m-consultant/src/main/res/layout/consultant_ui_price_popup_window.xml
+8
-7
home_category_list_item.xml
m-home/src/main/res/layout/home_category_list_item.xml
+2
-2
home_button_banner_view.xml
m-home/src/ydl/res/layout/home_button_banner_view.xml
+20
-20
No files found.
build.gradle
View file @
5743717e
...
@@ -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/rangeseekbar/RangeSeekBar.java
View file @
5743717e
...
@@ -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
/
2
f
;
float
x
=
getProgressLeft
()
+
k
*
stepMarks
-
stepsWidth
/
2
f
;
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
View file @
5743717e
...
@@ -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=
"
2
dp"
android:width=
"
3.5
dp"
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
View file @
5743717e
...
@@ -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
View file @
5743717e
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
<View
<View
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
6
dp"
android:layout_height=
"
2
dp"
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
View file @
5743717e
...
@@ -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
View file @
5743717e
...
@@ -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
View file @
5743717e
...
@@ -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_
d
p_12"
/>
android:textSize=
"@dimen/platform_
s
p_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_
d
p_12"
/>
android:textSize=
"@dimen/platform_
s
p_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_
d
p_12"
/>
android:textSize=
"@dimen/platform_
s
p_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_
d
p_12"
/>
android:textSize=
"@dimen/platform_
s
p_12"
/>
</RelativeLayout>
</RelativeLayout>
<ImageView
<ImageView
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment