Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
HBHAndroid
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
杨秀秀
HBHAndroid
Commits
99f2cb55
Commit
99f2cb55
authored
Jul 25, 2024
by
小费同学阿
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基础搭建
功能开发 1:bug 修复 企业端大字体部分界面影响使用修复
parent
7c738f62
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
26 deletions
+33
-26
fragment_home.xml
hbhbcompany/src/main/res/layout/fragment_home.xml
+6
-6
fragment_mine.xml
hbhbcompany/src/main/res/layout/fragment_mine.xml
+10
-10
item_appeal_list.xml
hbhbcompany/src/main/res/layout/item_appeal_list.xml
+6
-1
item_consultation_information.xml
...any/src/main/res/layout/item_consultation_information.xml
+3
-3
item_merchant_audit.xml
hbhbcompany/src/main/res/layout/item_merchant_audit.xml
+2
-1
item_my_like.xml
hbhbcompany/src/main/res/layout/item_my_like.xml
+3
-3
item_product_list.xml
hbhbcompany/src/main/res/layout/item_product_list.xml
+3
-2
No files found.
hbhbcompany/src/main/res/layout/fragment_home.xml
View file @
99f2cb55
...
@@ -129,12 +129,12 @@
...
@@ -129,12 +129,12 @@
tools:ignore=
"ContentDescription,HardcodedText"
/>
tools:ignore=
"ContentDescription,HardcodedText"
/>
<!--资讯信息-文字-->
<!--资讯信息-文字-->
<TextView
<TextView
android:layout_width=
"
80dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/information"
android:text=
"@string/information"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<ImageView
<ImageView
...
@@ -229,12 +229,12 @@
...
@@ -229,12 +229,12 @@
tools:ignore=
"ContentDescription,HardcodedText"
/>
tools:ignore=
"ContentDescription,HardcodedText"
/>
<!--招聘信息-文字-->
<!--招聘信息-文字-->
<TextView
<TextView
android:layout_width=
"
80dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/job"
android:text=
"@string/job"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<ImageView
<ImageView
...
@@ -328,12 +328,12 @@
...
@@ -328,12 +328,12 @@
tools:ignore=
"ContentDescription,HardcodedText"
/>
tools:ignore=
"ContentDescription,HardcodedText"
/>
<!--活动中心-文字-->
<!--活动中心-文字-->
<TextView
<TextView
android:layout_width=
"
80dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/activity_center"
android:text=
"@string/activity_center"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<ImageView
<ImageView
...
...
hbhbcompany/src/main/res/layout/fragment_mine.xml
View file @
99f2cb55
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
android:text=
"@={mineViewModel.nickName}"
android:text=
"@={mineViewModel.nickName}"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"20
s
p"
android:textSize=
"20
d
p"
android:textStyle=
"bold"
android:textStyle=
"bold"
app:layout_constraintRight_toRightOf=
"@+id/tv_ame_num1"
app:layout_constraintRight_toRightOf=
"@+id/tv_ame_num1"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
android:paddingRight=
"5dp"
android:paddingRight=
"5dp"
android:text=
"@={mineViewModel.roleName}"
android:text=
"@={mineViewModel.roleName}"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"13
s
p"
android:textSize=
"13
d
p"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
android:layout_marginTop=
"21dp"
android:layout_marginTop=
"21dp"
android:text=
"@={mineViewModel.deptName}"
android:text=
"@={mineViewModel.deptName}"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"14
s
p"
android:textSize=
"14
d
p"
app:layout_constraintRight_toRightOf=
"@+id/tv_ame_num1"
app:layout_constraintRight_toRightOf=
"@+id/tv_ame_num1"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
</LinearLayout>
</LinearLayout>
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/my_like"
android:text=
"@string/my_like"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<!--arrow右箭头进入-->
<!--arrow右箭头进入-->
<ImageView
<ImageView
...
@@ -269,7 +269,7 @@
...
@@ -269,7 +269,7 @@
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/change_password"
android:text=
"@string/change_password"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<!--右箭头-->
<!--右箭头-->
<ImageView
<ImageView
...
@@ -339,7 +339,7 @@
...
@@ -339,7 +339,7 @@
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/privacy_agreement"
android:text=
"@string/privacy_agreement"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<!--arrow右箭头进入-->
<!--arrow右箭头进入-->
<ImageView
<ImageView
...
@@ -401,7 +401,7 @@
...
@@ -401,7 +401,7 @@
android:layout_marginStart=
"12dp"
android:layout_marginStart=
"12dp"
android:text=
"@string/clear_cache"
android:text=
"@string/clear_cache"
android:textColor=
"#5A5A5A"
android:textColor=
"#5A5A5A"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<!--arrow右箭头进入-->
<!--arrow右箭头进入-->
<ImageView
<ImageView
...
@@ -455,7 +455,7 @@
...
@@ -455,7 +455,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
android:layout_marginLeft=
"29dp"
android:layout_marginLeft=
"29dp"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<!--检查更新-文字-->
<!--检查更新-文字-->
...
@@ -468,7 +468,7 @@
...
@@ -468,7 +468,7 @@
app:layout_constraintRight_toLeftOf=
"@+id/iv_mine_version"
app:layout_constraintRight_toLeftOf=
"@+id/iv_mine_version"
android:layout_marginRight=
"13dp"
android:layout_marginRight=
"13dp"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
android:textSize=
"16
s
p"
/>
android:textSize=
"16
d
p"
/>
<!--arrow右箭头进入-->
<!--arrow右箭头进入-->
<ImageView
<ImageView
android:layout_width=
"14dp"
android:layout_width=
"14dp"
...
@@ -495,7 +495,7 @@
...
@@ -495,7 +495,7 @@
android:text=
"@string/log_out"
android:text=
"@string/log_out"
android:textColor=
"#5971A4"
android:textColor=
"#5971A4"
android:onClick=
"@{mineViewModel.exitLogin}"
android:onClick=
"@{mineViewModel.exitLogin}"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
</LinearLayout>
</LinearLayout>
...
...
hbhbcompany/src/main/res/layout/item_appeal_list.xml
View file @
99f2cb55
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
android:layout_marginLeft=
"13dp"
android:layout_marginLeft=
"13dp"
android:layout_marginTop=
"21.5dp"
android:layout_marginTop=
"21.5dp"
android:paddingLeft=
"13dp"
android:paddingLeft=
"13dp"
android:textSize=
"16dp"
android:paddingRight=
"13dp"
android:paddingRight=
"13dp"
android:text=
"反馈"
/>
android:text=
"反馈"
/>
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
style=
"@style/xxBtnStyle"
style=
"@style/xxBtnStyle"
android:layout_width=
"62dp"
android:layout_width=
"62dp"
android:layout_height=
"28dp"
android:layout_height=
"28dp"
android:textSize=
"16dp"
android:layout_marginLeft=
"13dp"
android:layout_marginLeft=
"13dp"
android:layout_marginTop=
"21.5dp"
android:layout_marginTop=
"21.5dp"
android:paddingLeft=
"13dp"
android:paddingLeft=
"13dp"
...
@@ -148,6 +149,7 @@
...
@@ -148,6 +149,7 @@
style=
"@style/xxBtnStyle"
style=
"@style/xxBtnStyle"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"28dp"
android:layout_height=
"28dp"
android:textSize=
"16dp"
android:layout_marginLeft=
"13dp"
android:layout_marginLeft=
"13dp"
android:layout_marginTop=
"21.5dp"
android:layout_marginTop=
"21.5dp"
android:paddingLeft=
"13dp"
android:paddingLeft=
"13dp"
...
@@ -164,6 +166,7 @@
...
@@ -164,6 +166,7 @@
android:layout_marginTop=
"21.5dp"
android:layout_marginTop=
"21.5dp"
android:paddingLeft=
"13dp"
android:paddingLeft=
"13dp"
android:paddingRight=
"13dp"
android:paddingRight=
"13dp"
android:textSize=
"16dp"
android:text=
"删除"
android:text=
"删除"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
...
@@ -176,6 +179,7 @@
...
@@ -176,6 +179,7 @@
android:layout_marginTop=
"21.5dp"
android:layout_marginTop=
"21.5dp"
android:paddingLeft=
"13dp"
android:paddingLeft=
"13dp"
android:paddingRight=
"13dp"
android:paddingRight=
"13dp"
android:textSize=
"16dp"
android:text=
"编辑"
android:text=
"编辑"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
...
@@ -188,6 +192,7 @@
...
@@ -188,6 +192,7 @@
android:layout_marginTop=
"21.5dp"
android:layout_marginTop=
"21.5dp"
android:paddingLeft=
"13dp"
android:paddingLeft=
"13dp"
android:paddingRight=
"13dp"
android:paddingRight=
"13dp"
android:textSize=
"16dp"
android:text=
"完成"
android:text=
"完成"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
...
...
hbhbcompany/src/main/res/layout/item_consultation_information.xml
View file @
99f2cb55
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
android:maxLines=
"2"
android:maxLines=
"2"
android:text=
"@{consultationInformation.informationTitle}"
android:text=
"@{consultationInformation.informationTitle}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:text=
"@{consultationInformation.clickNumber}"
android:text=
"@{consultationInformation.clickNumber}"
android:textColor=
"@color/content_grey"
android:textColor=
"@color/content_grey"
android:textSize=
"14
s
p"
/>
android:textSize=
"14
d
p"
/>
</LinearLayout>
</LinearLayout>
<TextView
<TextView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
android:gravity=
"right"
android:gravity=
"right"
android:text=
"@{consultationInformation.publishTime}"
android:text=
"@{consultationInformation.publishTime}"
android:textColor=
"@color/content_grey"
android:textColor=
"@color/content_grey"
android:textSize=
"14
s
p"
/>
android:textSize=
"14
d
p"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
...
...
hbhbcompany/src/main/res/layout/item_merchant_audit.xml
View file @
99f2cb55
...
@@ -75,13 +75,14 @@
...
@@ -75,13 +75,14 @@
app:layout_constraintTop_toBottomOf=
"@+id/tv_ima_title"
app:layout_constraintTop_toBottomOf=
"@+id/tv_ima_title"
app:layout_constraintLeft_toLeftOf=
"@+id/tv_ima_title"
app:layout_constraintLeft_toLeftOf=
"@+id/tv_ima_title"
android:text=
"@={viewModel.person}"
android:text=
"@={viewModel.person}"
android:textSize=
"16dp"
android:ellipsize=
"end"
android:ellipsize=
"end"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
/>
/>
<TextView
<TextView
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:id=
"@+id/tv_ima_phone"
android:id=
"@+id/tv_ima_phone"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:singleLine=
"true"
android:singleLine=
"true"
...
...
hbhbcompany/src/main/res/layout/item_my_like.xml
View file @
99f2cb55
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
android:maxLines=
"2"
android:maxLines=
"2"
android:text=
"@{myLikeBean.informationTitle}"
android:text=
"@{myLikeBean.informationTitle}"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"16
s
p"
android:textSize=
"16
d
p"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:text=
"@{myLikeBean.clickNumber}"
android:text=
"@{myLikeBean.clickNumber}"
android:textColor=
"@color/content_grey"
android:textColor=
"@color/content_grey"
android:textSize=
"14
s
p"
android:textSize=
"14
d
p"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
android:layout_marginRight=
"6dp"
android:layout_marginRight=
"6dp"
android:text=
"@{myLikeBean.publishTime}"
android:text=
"@{myLikeBean.publishTime}"
android:textColor=
"@color/content_grey"
android:textColor=
"@color/content_grey"
android:textSize=
"14
s
p"
/>
android:textSize=
"14
d
p"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
...
...
hbhbcompany/src/main/res/layout/item_product_list.xml
View file @
99f2cb55
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<Button
<Button
android:layout_width=
"
62dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"28dp"
android:layout_height=
"28dp"
android:visibility=
"gone"
android:visibility=
"gone"
android:layout_marginLeft=
"11dp"
android:layout_marginLeft=
"11dp"
...
@@ -118,9 +118,10 @@
...
@@ -118,9 +118,10 @@
android:text=
"审核"
/>
android:text=
"审核"
/>
<Button
<Button
android:layout_width=
"
62dp
"
android:layout_width=
"
wrap_content
"
android:visibility=
"gone"
android:visibility=
"gone"
android:layout_height=
"28dp"
android:layout_height=
"28dp"
android:textSize=
"16dp"
android:layout_marginLeft=
"11dp"
android:layout_marginLeft=
"11dp"
android:id=
"@+id/btn_ipl_out"
android:id=
"@+id/btn_ipl_out"
style=
"@style/xxBtnStyle"
style=
"@style/xxBtnStyle"
...
...
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